The render method needs to be last, otherwise the error header won't get set. Needs...

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

index e76028114575dd2c6b655e55d05c64b90912253d..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")
@@ -35,7 +35,7 @@ begin
  
    Trace.sum(:size, :group => :user_id, :order => "sum_size DESC", :limit => 50).each do |user, count|
      display_name = User.find(user).display_name.gsub('@', ' at ').gsub('.', ' dot ')
-    puts "<tr><td>#{display_name}</td><td>#{count}</td></tr>"
+    puts "<tr><td><a href=\"/user/#{display_name}\">#{display_name}</a></td><td>#{count}</td></tr>"
    end
  
    puts "</table>"
@@ -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>"
@@ -83,7 +89,7 @@ begin
        else
          display_name = User.find(column[0]).display_name.gsub('@', ' at ').gsub('.', ' dot ')
          count = column[1]
-        puts "<td>#{count} #{display_name}</td>"
+        puts "<td>#{count} <a href=\"/user/#{display_name}\">#{display_name}</a></td>"
        end
      end
      puts "</tr>"