Tidy things up and fix a few errors.

[rails.git] / script / statistics

diff --git a/script/statistics b/script/statistics
index e5f82bba6152d37917261e8f6b4c01b4b553cf61..62c7e93a966eddfd229dc6ae3c14b01d831729c2 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -53,11 +53,14 @@ begin
 
   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, 
+  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")
 
   puts "<tr><th>Nodes</th><td>#{day_count}</td><td>#{week_count}</td><td>#{month_count}</td></tr>"
@@ -69,11 +72,14 @@ begin
   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")
+                            :include => :changeset, :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)
+                             :include => :changeset, :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)
+                              :include => :changeset, :group => :user_id,
+                              :order => "count_all DESC", :limit => 60)
 
   SyncEnumerator.new(day_users, week_users, month_users).each do |row|
     puts "<tr>"