X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5449cf4adcc1fad4b9f43426e6d3e4a8f65e6fbb..e3ae690a006f4bf23eaedcd9817d0750ceeebc55:/script/statistics?ds=sidebyside diff --git a/script/statistics b/script/statistics index 62c7e93a9..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") @@ -45,23 +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, :include => :changeset, - :conditions => "timestamp > NOW() - INTERVAL 1 DAY") + :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL") week_count = OldNode.count(:user_id, :distinct => true, :include => :changeset, - :conditions => "timestamp > NOW() - INTERVAL 7 DAY") + :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL") month_count = OldNode.count(:user_id, :distinct => true, :include => :changeset, - :conditions => "timestamp > NOW() - INTERVAL 28 DAY") + :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL") puts "Nodes#{day_count}#{week_count}#{month_count}" @@ -71,13 +71,13 @@ begin puts "" puts "" - day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY", + 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() - INTERVAL 7 DAY", + 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() - INTERVAL 28 DAY", + month_users = OldNode.count(:conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL", :include => :changeset, :group => :user_id, :order => "count_all DESC", :limit => 60)

Day	Week	Month