X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/088b4ae1e2dbc44ef82f3b965b8f5b8ab2444e78..cc57c65083528d7c9085a2121cea7650b2e9a794:/script/statistics

diff --git a/script/statistics b/script/statistics
index f04879359..c201f6c57 100755
--- a/script/statistics
+++ b/script/statistics
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
-require 'generator'
 
 start_time = Time.now
 
@@ -16,7 +15,7 @@ puts "<h2>OpenStreetMap stats report run at #{start_time.to_s}</h2>"
 
 begin
   ActiveRecord::Base.transaction do
-    user_count = User.count(:conditions => "active = 1")
+    user_count = User.count(:conditions => { :status => ["active", "confirmed", "suspended"] })
     tracepoint_count = Tracepoint.count()
     node_count = Node.count(:conditions => "visible = true")
     way_count = Way.count(:conditions => "visible = true")
@@ -34,7 +33,7 @@ begin
     puts "<table>"
     puts "<tr><th>User</th><th>Number of Points</th></tr>"
 
-    Trace.sum(:size, :group => :user_id, :order => "sum_size DESC", :limit => 50).each do |user, count|
+    Trace.sum(:size, :conditions => { :inserted => true }, :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><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
     end
@@ -79,7 +78,7 @@ begin
                                 :joins => :changeset, :group => :user_id,
                                 :order => "count_all DESC", :limit => 60)
 
-    SyncEnumerator.new(day_users, week_users, month_users).each do |row|
+    day_users.zip(week_users, month_users).each do |row|
       puts "<tr>"
       row.each do |column|
         if column.nil?
@@ -102,3 +101,5 @@ end
 puts "<p>Report took #{(Time.new - start_time).to_s} seconds to run</p>"
 puts "</body>"
 puts "</html>"
+
+exit 0