Multiple changes

* Improved and cleaned up source import scripts
* Improved some reports and report overview
* New osmium version that uses a better hash function
* Some experimental magic to include Javascipt in an easier way (tested in keys.erb)

1 files changed, 17 insertions, 0 deletions

diff --git a/web/taginfo.rb b/web/taginfo.rb
index 8bc5233..a3de09b 100755
--- a/web/taginfo.rb
+++ b/web/taginfo.rb
@@ -35,8 +35,10 @@ require 'sinatra/base'
 require 'sinatra/r18n'
 
 require 'lib/utils.rb'
+require 'lib/javascript.rb'
 require 'lib/language.rb'
 require 'lib/sql.rb'
+require 'lib/sources.rb'
 require 'lib/reports.rb'
 
 #------------------------------------------------------------------------------
@@ -45,6 +47,15 @@ TAGCLOUD_NUMBER_OF_TAGS = 200
 
 #------------------------------------------------------------------------------
 
+db = SQL::Database.new('../../data')
+
+# XXX update this to use new sources table
+db.select('SELECT * FROM master_meta ORDER BY source_name').execute().each do |source|
+    Source.new source['source_id'], source['source_name'], source['data_until'], source['update_start'], source['update_end']
+end
+
+db.close
+
 class Taginfo < Sinatra::Base
 
     register Sinatra::R18n
@@ -84,6 +95,12 @@ class Taginfo < Sinatra::Base
 #        end
         params[:locale] = 'en'
 
+        javascript 'jquery-1.3.2.min'
+        javascript 'jquery-ui-1.7.2.all.min'
+        javascript 'flexigrid-minified'
+        javascript 'taginfo'
+        javascript 'protovis-r3.2'
+
         @db = SQL::Database.new('../../data')
 
         @data_until = @db.select("SELECT min(data_until) FROM master_meta").get_first_value().sub(/:..$/, '')