From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 06 Dec 2012 15:08:20 +0000
Subject: Fixing two bugs in one, making sure All are deleted as well as period and fixing a string concat problem
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=0f31123b4d608fe59a5fe88abff793e7663fcf25
---
Fixing two bugs in one, making sure All are deleted as well as period and fixing a string concat problem
---


--- a/ckanext/ga_report/ga_model.py
+++ b/ckanext/ga_report/ga_model.py
@@ -161,10 +161,13 @@
 
 
 def pre_update_url_stats(period_name):
+    log.debug("Deleting '%s' records" % period_name)
     model.Session.query(GA_Url).\
             filter(GA_Url.period_name==period_name).delete()
+    log.debug("Deleting 'All' records")
     model.Session.query(GA_Url).\
-            filter(GA_Url.period_name=='All').delete()
+            filter(GA_Url.period_name == 'All').delete()
+    model.repo.commit_and_remove()
 
 
 def update_url_stats(period_name, period_complete_day, url_data):
@@ -216,8 +219,8 @@
                       'period_name': 'All',
                       'period_complete_day': 0,
                       'url': url,
-                      'pageviews': sum([int(e.pageviews) for e in entries]) + old_pageviews,
-                      'visits': sum([int(e.visits or 0) for e in entries]) + old_visits,
+                      'pageviews': sum([int(e.pageviews) for e in entries]) + int(old_pageviews),
+                      'visits': sum([int(e.visits or 0) for e in entries]) + int(old_visits),
                       'department_id': publisher,
                       'package_id': package
                      }