api06: Fix normal way and relation uploading (i.e. not as part of a diff).

[rails.git] / script / statistics

diff --git a/script/statistics b/script/statistics
index 47c18312d6687b0af8edc4fa2b7b972a4510c051..e76028114575dd2c6b655e55d05c64b90912253d 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -18,18 +18,15 @@ begin
   user_count = User.count(:conditions => "active = true")
   tracepoint_count = Tracepoint.count()
   node_count = Node.count(:conditions => "visible = true")
   user_count = User.count(:conditions => "active = true")
   tracepoint_count = Tracepoint.count()
   node_count = Node.count(:conditions => "visible = true")

-  segment_count = Segment.count(:conditions => "visible = true")

   way_count = Way.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")
+  relation_count = Relation.count(:conditions => "visible = true")

 
   puts "<table>"
   puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"
   puts "<tr><td>Number of uploaded GPS points</td><td>#{tracepoint_count}</td></tr>"
   puts "<tr><td>Number of nodes</td><td>#{node_count}</td></tr>"
 
   puts "<table>"
   puts "<tr><td>Number of users</td><td>#{user_count}</td></tr>"
   puts "<tr><td>Number of uploaded GPS points</td><td>#{tracepoint_count}</td></tr>"
   puts "<tr><td>Number of nodes</td><td>#{node_count}</td></tr>"

-  puts "<tr><td>Number of segments</td><td>#{segment_count}</td></tr>"

   puts "<tr><td>Number of ways</td><td>#{way_count}</td></tr>"
   puts "<tr><td>Number of ways</td><td>#{way_count}</td></tr>"

-  puts "<tr><td>Number of ways with tags</td><td>#{tagged_way_count}</td></tr>"
+  puts "<tr><td>Number of relations</td><td>#{relation_count}</td></tr>"

   puts "</table>"
 
   puts "<h2>Top 50 users for uploads of GPS data</h2>"
   puts "</table>"
 
   puts "<h2>Top 50 users for uploads of GPS data</h2>"


@@ -81,9 +78,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