Patching better 412 error messages from mis-commit on old api06 branch.

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

index e5f82bba6152d37917261e8f6b4c01b4b553cf61..5a17e8be40da68fd10a4d74be0536418e8614e7d 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,20 +45,23 @@ 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, 
-                            :conditions => "timestamp > NOW() - INTERVAL 1 DAY")
+  day_count = OldNode.count(:user_id, :distinct => true,
+                            :include => :changeset,
+                            :conditions => "timestamp > NOW() - '1 DAY'::INTERVAL")
    week_count = OldNode.count(:user_id, :distinct => true, 
-                             :conditions => "timestamp > NOW() - INTERVAL 7 DAY")
+                             :include => :changeset,
+                             :conditions => "timestamp > NOW() - '7 DAYS'::INTERVAL")
    month_count = OldNode.count(:user_id, :distinct => true, 
-                              :conditions => "timestamp > NOW() - INTERVAL 28 DAY")
+                              :include => :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>"
  
@@ -68,12 +71,15 @@ 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",
-                            :group => :user_id, :order => "count_all DESC")
-  week_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 7 DAY",
-                             :group => :user_id, :order => "count_all DESC", :limit => 60)
-  month_users = OldNode.count(:conditions => "timestamp > NOW() - INTERVAL 28 DAY",
-                              :group => :user_id, :order => "count_all DESC", :limit => 60)
+  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() - '7 DAYS'::INTERVAL",
+                             :include => :changeset, :group => :user_id,
+                             :order => "count_all DESC", :limit => 60)
+  month_users = OldNode.count(:conditions => "timestamp > NOW() - '28 DAYS'::INTERVAL",
+                              :include => :changeset, :group => :user_id,
+                              :order => "count_all DESC", :limit => 60)
  
    SyncEnumerator.new(day_users, week_users, month_users).each do |row|
      puts "<tr>"