From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 06 Dec 2012 16:30:31 +0000
Subject: Updated count of deleted records
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=25c791cfcf26848e6b6b8cf12e81b7997c7363cb
---
Updated count of deleted records
---


--- a/ckanext/ga_report/ga_model.py
+++ b/ckanext/ga_report/ga_model.py
@@ -164,9 +164,16 @@
     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).\
+
+    count = model.Session.query(GA_Url).\
+            filter(GA_Url.period_name == 'All').count()
+    log.debug("Deleting %d 'All' records" % count)
+    count = model.Session.query(GA_Url).\
             filter(GA_Url.period_name == 'All').delete()
+    log.debug("Deleted %d 'All' records" % count)
+
+    model.Session.flush()
+    model.Session.commit()
     model.repo.commit_and_remove()
 
 
@@ -349,7 +356,7 @@
         if period_name != 'All':
             q = q.filter_by(period_name=period_name)
         q.delete()
-    model.Session.commit()
+    model.repo.commit_and_remove()
 
 def get_score_for_dataset(dataset_name):
     '''