Improve error-handling

[rails.git] / script / statistics

diff --git a/script/statistics b/script/statistics
index afd5dd7d281c1a7b671cbc49596742e164e7014a..c201f6c5773ecebde3c087d7028386e757b2291f 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../config/environment'

-require 'generator'

 
 start_time = Time.now
 
 
 start_time = Time.now
 


@@ -16,7 +15,7 @@ puts "<h2>OpenStreetMap stats report run at #{start_time.to_s}</h2>"
 
 begin
   ActiveRecord::Base.transaction do
 
 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")
     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)
 
                                 :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 "<tr>"
       row.each do |column|
         if column.nil?
       puts "<tr>"
       row.each do |column|
         if column.nil?


@@ -102,3 +101,5 @@ end
 puts "<p>Report took #{(Time.new - start_time).to_s} seconds to run</p>"
 puts "</body>"
 puts "</html>"
 puts "<p>Report took #{(Time.new - start_time).to_s} seconds to run</p>"
 puts "</body>"
 puts "</html>"

+
+exit 0