Fix another error reporting bug similar to previous, again on printing RelationMember...

[rails.git] / script / statistics
diff --git a/script/statistics b/script/statistics

index 62c7e93a966eddfd229dc6ae3c14b01d831729c2..b076bef30e6be5f04bad237d146372e0e205121f 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -15,7 +15,7 @@ puts "<body>"
  puts "<h2>OpenStreetMap stats report run at #{start_time.to_s}</h2>"
  
  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,20 @@ begin
    puts "<tr><th>Data Type</th><th>Day</th><th>Week</th><th>Month</th></tr>"
  
    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 "<tr><th>GPX Files</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
  
-  day_count = OldNode.count(:user_id, :distinct => true,
-                            :include => :changeset,
-                            :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
-  week_count = OldNode.count(:user_id, :distinct => true, 
-                             :include => :changeset,
-                             :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
-  month_count = OldNode.count(:user_id, :distinct => true, 
-                              :include => :changeset,
-                              :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
+  day_count = OldNode.count(:user_id, :distinct => true, :joins => :changeset,
+                            :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
+  week_count = OldNode.count(:user_id, :distinct => true,  :joins => :changeset,
+                             :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
+  month_count = OldNode.count(:user_id, :distinct => true, :joins => :changeset,
+                              :conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL")
  
    puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
  
@@ -71,14 +68,14 @@ begin
    puts "<table>"
    puts "<tr><th>Day</th><th>Week</th><th>Month</th></tr>"
  
-  day_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 1 DAY",
-                            :include => :changeset, :group => :user_id,
+  day_users = OldNode.count(:conditions => "timestamp > NOW() - '1 DAY'::INTERVAL",
+                            :joins => :changeset, :group => :user_id,
                              :order => "count_all DESC")
-  week_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 7 DAY",
-                             :include => :changeset, :group => :user_id,
+  week_users = OldNode.count(:conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL",
+                             :joins => :changeset, :group => :user_id,
                               :order => "count_all DESC", :limit => 60)
-  month_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 28 DAY",
-                              :include => :changeset, :group => :user_id,
+  month_users = OldNode.count(:conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL",
+                              :joins => :changeset, :group => :user_id,
                                :order => "count_all DESC", :limit => 60)
  
    SyncEnumerator.new(day_users, week_users, month_users).each do |row|