X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f29300bf1a57a96dccacc20daade126dbea42f74..2e2b556a254e25610d28083c4e87f0f9d3daa542:/script/statistics diff --git a/script/statistics b/script/statistics index e76028114..62c7e93a9 100755 --- a/script/statistics +++ b/script/statistics @@ -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 ') - puts "#{display_name}#{count}" + puts "#{display_name}#{count}" end puts "" @@ -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 "" @@ -83,7 +89,7 @@ begin else display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ') count = column[1] - puts "#{count} #{display_name}" + puts "#{count} #{display_name}" end end puts ""