Doing a resync from mainline 8633:10895. There was one simple to resolve conflict...

[rails.git] / script / statistics

diff --git a/script/statistics b/script/statistics
index a703b3a0dd725f0b7281011526517a85bed8fe33..e5f82bba6152d37917261e8f6b4c01b4b553cf61 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -19,14 +19,14 @@ begin
   tracepoint_count = Tracepoint.count()
   node_count = Node.count(:conditions => "visible = true")
   way_count = Way.count(:conditions => "visible = true")
   tracepoint_count = Tracepoint.count()
   node_count = Node.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 ways</td><td>#{way_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 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>"


@@ -35,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 ')
 
   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>"
   end
 
   puts "</table>"


@@ -83,7 +83,7 @@ begin
       else
         display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ')
         count = column[1]
       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>"
       end
     end
     puts "</tr>"