only show map to actual user

[rails.git] / script / statistics

diff --git a/script/statistics b/script/statistics
index 50363dc32d543814d94e2dc4a4a6ca52fd017bd3..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")
-  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")
+  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 "<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 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>"
@@ -54,9 +51,7 @@ begin
   month_count = Trace.count(:user_id, :distinct => true, 
                             :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
 
-  puts "<tr><th>GPX Files</th><td>Day</td><td>#{day_count}</td></tr>"
-  puts "<tr><th>GPX Files</th><td>Week</td><td>#{week_count}</td></tr>"
-  puts "<tr><th>GPX Files</th><td>Month</td><td>#{month_count}</td></tr>"
+  puts "<tr><th>GPX Files</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
   day_count = OldNode.count(:user_id, :distinct => true, 
                             :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
@@ -65,9 +60,7 @@ begin
   month_count = OldNode.count(:user_id, :distinct => true, 
                               :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
 
-  puts "<tr><th>Nodes</th><td>Day</td><td>#{day_count}</td></tr>"
-  puts "<tr><th>Nodes</th><td>Week</td><td>#{week_count}</td></tr>"
-  puts "<tr><th>Nodes</th><td>Month</td><td>#{month_count}</td></tr>"
+  puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
 
   puts "</table>"
   
@@ -85,9 +78,13 @@ begin
   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