Fix counting of tagged ways, and handle having more users in the days

columns than the other columns.

diff --git a/script/statistics b/script/statistics
index 47c18312d6687b0af8edc4fa2b7b972a4510c051..3f0c433f225cb2aa0b3bffc89bcd48ae503bf722 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -20,8 +20,7 @@ begin
   node_count = Node.count(:conditions => "visible = true")
   segment_count = Segment.count(:conditions => "visible = true")
   way_count = Way.count(:conditions => "visible = true")
   node_count = Node.count(:conditions => "visible = true")
   segment_count = Segment.count(:conditions => "visible = true")
   way_count = Way.count(:conditions => "visible = true")

-  tagged_way_count = Way.count(:conditions => "current_ways.visible = true AND current_way_tags.k <> 'created_by'",
-                               :joins => "INNER JOIN current_way_tags ON current_way_tags.id = current_ways.id")
+  tagged_way_count = Way.count(:conditions => "visible = true AND EXISTS (SELECT * FROM current_way_tags WHERE id = current_ways.id AND k <> 'created_by')")

 
   puts "<table>"
   puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"
 
   puts "<table>"
   puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"


@@ -81,9 +80,13 @@ begin
   SyncEnumerator.new(day_users, week_users, month_users).each do |row|
     puts "<tr>"
     row.each do |column|
   SyncEnumerator.new(day_users, week_users, month_users).each do |row|
     puts "<tr>"
     row.each do |column|

-      display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ')
-      count = column[1]
-      puts "<td>#{count} #{display_name}</td>"
+      if column.nil?
+        puts "<td></td>"
+      else
+        display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ')
+        count = column[1]
+        puts "<td>#{count} #{display_name}</td>"
+      end

     end
     puts "</tr>"
   end
     end
     puts "</tr>"
   end