From: Ross Jones <rossdjones@gmail.com>
Date: Fri, 04 Jan 2013 15:29:14 +0000
Subject: Minor tweaks
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=4d5b06c1ff54349283c16ebb61f189342acc4cad
---
Minor tweaks
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -223,9 +223,7 @@
                 continue
             data[r] += int(entry.value)
 
-        for k,v in data.iteritems():
-            c.downloads.append((k,v))
-
+        c.downloads = [(k,v,) for k,v in data.iteritems()]
         c.downloads = sorted(c.downloads, key=operator.itemgetter(1), reverse=True)
 
         return render('ga_report/site/downloads.html')

--- a/ckanext/ga_report/download_analytics.py
+++ b/ckanext/ga_report/download_analytics.py
@@ -304,10 +304,14 @@
                                  max_results=10000,
                                  end_date=end_date).execute()
         result_data = results.get('rows')
+        if not result_data:
+            # We may not have data for this time period, so we need to bail
+            # early.
+            log.info("There is no download data for this time period")
+            return
+
         # [[url, count], [url],count]
         data = {}
-        if not result_data:
-            log.error(results)
         for result in result_data:
             data[result[0]] = data.get(result[0], 0) + int(result[1])
         self._filter_out_long_tail(data, MIN_DOWNLOADS)

--- a/ckanext/ga_report/templates/ga_report/ga_util.html
+++ b/ckanext/ga_report/templates/ga_report/ga_util.html
@@ -46,7 +46,7 @@
 
 <table py:def="downloads_table(items)" class="table table-condensed table-bordered table-striped">
     <tr>
-        <th>Name</th>
+        <th>Dataset and resource</th>
         <th>Downloads</th>
     </tr>
     <py:for each="resource, value in items">