X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/3336fd946974420944290f9bdc89164e69edd599..c4f937f09907d6ffce6c6e9c96bbacea351a5c1a:/script/statistics diff --git a/script/statistics b/script/statistics index e5f82bba6..62c7e93a9 100755 --- a/script/statistics +++ b/script/statistics @@ -53,11 +53,14 @@ begin puts "GPX Files#{day_count}#{week_count}#{month_count}" - 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 "Nodes#{day_count}#{week_count}#{month_count}" @@ -69,11 +72,14 @@ begin puts "DayWeekMonth" 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 ""