X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ace29736c7df752c5a0ee2dd82f29b233d9a9e9c..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/script/statistics diff --git a/script/statistics b/script/statistics index 315c6cd18..47a368a81 100755 --- a/script/statistics +++ b/script/statistics @@ -11,15 +11,15 @@ puts "OpenStreetMap Statistics" puts "" puts "" puts "" -puts "

OpenStreetMap stats report run at #{start_time.to_s}

" +puts "

OpenStreetMap stats report run at #{start_time}

" begin ActiveRecord::Base.transaction do - 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") - relation_count = Relation.count(:conditions => "visible = true") + user_count = User.where(:status => %w(active confirmed suspended)).count + tracepoint_count = Tracepoint.count + node_count = Node.where(:visible => true).count + way_count = Way.where(:visible => true).count + relation_count = Relation.where(:visible => true).count puts "" puts "" @@ -57,14 +57,14 @@ begin puts "" puts "
Number of users#{user_count}
Nodes#{day_count}#{week_count}#{month_count}
" - + puts "

Top users editing over the past...

" puts "" puts "" - day_users = OldNode.where("timestamp > NOW() - '1 DAY'::INTERVAL").joins(:changeset).order("count_all DESC").limit(50).group(:user_id).count - week_users = OldNode.where("timestamp > NOW() - '7 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(50).group(:user_id).count - month_users = OldNode.where("timestamp > NOW() - '28 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(50).group(:user_id).count + day_users = OldNode.where("timestamp > NOW() - '1 DAY'::INTERVAL").joins(:changeset).order("count_all DESC").group(:user_id).count + week_users = OldNode.where("timestamp > NOW() - '7 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(60).group(:user_id).count + month_users = OldNode.where("timestamp > NOW() - '28 DAYS'::INTERVAL").joins(:changeset).order("count_all DESC").limit(60).group(:user_id).count day_users.zip(week_users, month_users).each do |row| puts "" @@ -83,10 +83,10 @@ begin puts "
DayWeekMonth
" end rescue Exception => e - puts "

Exception: #{e.to_s}
#{e.backtrace.join('
')}

" + puts "

Exception: #{e}
#{e.backtrace.join('
')}

" end -puts "

Report took #{(Time.new - start_time).to_s} seconds to run

" +puts "

Report took #{(Time.new - start_time)} seconds to run

" puts "" puts ""