X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e6269e25f5a4cf96a7e5fed7057fb3a1981538e6..031afed7aae4492a96bdf389ffc504a9955677ad:/script/statistics diff --git a/script/statistics b/script/statistics index 2e60d630f..c201f6c57 100755 --- a/script/statistics +++ b/script/statistics @@ -1,7 +1,6 @@ #!/usr/bin/env ruby require File.dirname(__FILE__) + '/../config/environment' -require 'generator' start_time = Time.now @@ -16,7 +15,7 @@ puts "

OpenStreetMap stats report run at #{start_time.to_s}

" begin ActiveRecord::Base.transaction do - user_count = User.count(:conditions => "active = 1") + 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") @@ -79,7 +78,7 @@ begin :joins => :changeset, :group => :user_id, :order => "count_all DESC", :limit => 60) - SyncEnumerator.new(day_users, week_users, month_users).each do |row| + day_users.zip(week_users, month_users).each do |row| puts "" row.each do |column| if column.nil?