X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/0eee4fecbee6ec650cd325934ff5f23796dc67af..6488ebe12fa01f7622eae8a44e52fcb0dfaeb264:/script/statistics

diff --git a/script/statistics b/script/statistics
index 3f0c433f2..62c7e93a9 100755
--- a/script/statistics
+++ b/script/statistics
@@ -18,17 +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 => "visible = true AND EXISTS (SELECT * FROM current_way_tags WHERE id = current_ways.id AND k <> 'created_by')")
+  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>"
@@ -37,7 +35,7 @@ begin
 
   Trace.sum(:size, :group => :user_id, :order => "sum_size DESC", :limit => 50).each do |user, count|
     display_name = User.find(user).display_name.gsub('@', ' at ').gsub('.', ' dot ')
-    puts "<tr><td>#{display_name}</td><td>#{count}</td></tr>"
+    puts "<tr><td><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
   end
 
   puts "</table>"
@@ -55,11 +53,14 @@ begin
 
   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, 
+  day_count = OldNode.count(:user_id, :distinct => true,
+                            :include => :changeset,
                             :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
   week_count = OldNode.count(:user_id, :distinct => true, 
+                             :include => :changeset,
                              :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
   month_count = OldNode.count(:user_id, :distinct => true, 
+                              :include => :changeset,
                               :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
 
   puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
@@ -71,11 +72,14 @@ begin
   puts "<tr><th>Day</th><th>Week</th><th>Month</th></tr>"
 
   day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY",
-                            :group => :user_id, :order => "count_all DESC")
+                            :include => :changeset, :group => :user_id,
+                            :order => "count_all DESC")
   week_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 7 DAY",
-                             :group => :user_id, :order => "count_all DESC", :limit => 60)
+                             :include => :changeset, :group => :user_id,
+                             :order => "count_all DESC", :limit => 60)
   month_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 28 DAY",
-                              :group => :user_id, :order => "count_all DESC", :limit => 60)
+                              :include => :changeset, :group => :user_id,
+                              :order => "count_all DESC", :limit => 60)
 
   SyncEnumerator.new(day_users, week_users, month_users).each do |row|
     puts "<tr>"
@@ -85,7 +89,7 @@ begin
       else
         display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ')
         count = column[1]
-        puts "<td>#{count} #{display_name}</td>"
+        puts "<td>#{count} <a href=\"/user/#{display_name}\">#{display_name}</a></td>"
       end
     end
     puts "</tr>"