X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d9e070e06956801aba2378c1b79b4d9f13ae12ee..9b2248e8fb89a74c582393bb77d1d5e4d86d8e87:/script/statistics
diff --git a/script/statistics b/script/statistics
index e5f82bba6..7105d475d 100755
--- a/script/statistics
+++ b/script/statistics
@@ -15,7 +15,7 @@ puts ""
puts "OpenStreetMap stats report run at #{start_time.to_s}
"
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")
@@ -53,11 +53,14 @@ begin
puts "| GPX Files | #{day_count} | #{week_count} | #{month_count} |
|---|
"
- 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 "| Nodes | #{day_count} | #{week_count} | #{month_count} |
|---|
"
@@ -69,11 +72,14 @@ begin
puts "| Day | Week | Month |
|---|
"
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 ""