X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f29300bf1a57a96dccacc20daade126dbea42f74..e3ae690a006f4bf23eaedcd9817d0750ceeebc55:/script/statistics?ds=sidebyside diff --git a/script/statistics b/script/statistics index e76028114..5a17e8be4 100755 --- a/script/statistics +++ b/script/statistics @@ -15,7 +15,7 @@ puts "" puts "

OpenStreetMap stats report run at #{start_time.to_s}

" begin - user_count = User.count(:conditions => "active = true") + user_count = User.count(:conditions => "active = 1") tracepoint_count = Tracepoint.count() node_count = Node.count(:conditions => "visible = true") way_count = Way.count(:conditions => "visible = true") @@ -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 "" @@ -45,20 +45,23 @@ begin puts "Data TypeDayWeekMonth" day_count = Trace.count(:user_id, :distinct => true, - :conditions => "timestamp > NOW() - INTERVAL 1 DAY") + :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL") week_count = Trace.count(:user_id, :distinct => true, - :conditions => "timestamp > NOW() - INTERVAL 7 DAY") + :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL") month_count = Trace.count(:user_id, :distinct => true, - :conditions => "timestamp > NOW() - INTERVAL 28 DAY") + :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL") puts "GPX Files#{day_count}#{week_count}#{month_count}" - day_count = OldNode.count(:user_id, :distinct => true, - :conditions => "timestamp > NOW() - INTERVAL 1 DAY") + day_count = OldNode.count(:user_id, :distinct => true, + :include => :changeset, + :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL") week_count = OldNode.count(:user_id, :distinct => true, - :conditions => "timestamp > NOW() - INTERVAL 7 DAY") + :include => :changeset, + :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL") month_count = OldNode.count(:user_id, :distinct => true, - :conditions => "timestamp > NOW() - INTERVAL 28 DAY") + :include => :changeset, + :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL") puts "Nodes#{day_count}#{week_count}#{month_count}" @@ -68,12 +71,15 @@ begin puts "" puts "" - day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY", - :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) - month_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 28 DAY", - :group => :user_id, :order => "count_all DESC", :limit => 60) + day_users = OldNode.count(:conditions => "timestamp > NOW() - '1 DAY'::INTERVAL", + :include => :changeset, :group => :user_id, + :order => "count_all DESC") + week_users = OldNode.count(:conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL", + :include => :changeset, :group => :user_id, + :order => "count_all DESC", :limit => 60) + month_users = OldNode.count(:conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL", + :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 "" + puts "" end end puts ""

Day	Week	Month
#{count} #{display_name}	#{count} #{display_name}