From: Ross Jones <rossdjones@gmail.com>
Date: Thu, 25 Oct 2012 14:48:13 +0000
Subject: Tidying up
X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=fb9969ea4b29984460f9a7a209c98a07481bf4c2
---
Tidying up
---


--- a/ckanext/ga_report/controller.py
+++ b/ckanext/ga_report/controller.py
@@ -34,7 +34,6 @@
             filter(GA_Stat.period_name==month).\
             order_by('GA_Stat.stat_name, GA_Stat.key').all()
 
-        response.headers['Content-disposition'] = 'attachment; filename=dgu_analytics_%s.csv' % (month)
         response.headers['Content-Type'] = "text/csv; charset=utf-8"
 
         writer = csv.writer(response)
@@ -88,30 +87,29 @@
     """
 
     def index(self):
-        try:
-            # Get the month details by fetching distinct values and determining the
-            # month names from the values.
-            c.months = _month_details(GA_Url)
 
-            # Work out which month to show, based on query params of the first item
-            c.month = request.params.get('month', c.months[0][0] if c.months else '')
-            c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
+        # Get the month details by fetching distinct values and determining the
+        # month names from the values.
+        c.months = _month_details(GA_Url)
 
-            connection = model.Session.connection()
-            q = """
-                select department_id, sum(pageviews::int) views, sum(visitors::int) visits
-                from ga_url
-                where department_id <> ''
-                    and not url like '/publisher/%%'
-                    and period_name=%s
-                group by department_id order by views desc limit 20;
-            """
-            c.top_publishers = []
-            res = connection.execute(q, c.month)
-            for row in res:
-                c.top_publishers.append((model.Group.get(row[0]), row[1], row[2]))
-        except Exception as e:
-            raise e
+        # Work out which month to show, based on query params of the first item
+        c.month = request.params.get('month', c.months[0][0] if c.months else '')
+        c.month_desc = ''.join([m[1] for m in c.months if m[0]==c.month])
+
+        connection = model.Session.connection()
+        q = """
+            select department_id, sum(pageviews::int) views, sum(visitors::int) visits
+            from ga_url
+            where department_id <> ''
+                and not url like '/publisher/%%'
+                and period_name=%s
+            group by department_id order by views desc limit 20;
+        """
+        c.top_publishers = []
+        res = connection.execute(q, c.month)
+        for row in res:
+            c.top_publishers.append((model.Group.get(row[0]), row[1], row[2]))
+
         return render('ga_report/publisher/index.html')
 
 

--- a/ckanext/ga_report/plugin.py
+++ b/ckanext/ga_report/plugin.py
@@ -18,7 +18,7 @@
 
     def after_map(self, map):
         map.connect(
-            '/data/analytics/publisher/',
+            '/data/analytics/publisher',
             controller='ckanext.ga_report.controller:GaPublisherReport',
             action='index'
         )
@@ -33,7 +33,7 @@
             action='index'
         )
         map.connect(
-            '/data/analytics_{month}.csv',
+            '/data/analytics/data_{month}.csv',
             controller='ckanext.ga_report.controller:GaReport',
             action='csv'
         )

--- a/ckanext/ga_report/templates/ga_report/publisher/read.html
+++ b/ckanext/ga_report/templates/ga_report/publisher/read.html
@@ -15,9 +15,8 @@
           As well as showing the number of views within ${c.month_desc}, it will also show the
           number of visitors that viewed each dataset.
       </p>
-      <p>
        <p>The dataset list page for <a href="${h.url_for(controller='ckanext.dgu.controllers.publisher:PublisherController', action='read', id=c.publisher.name)}">${c.publisher.title}</a> was viewed ${c.publisher_page_views} times during ${c.month_desc}</p>
-      </p>
+       <p>View the <a href="${h.url_for(controller='ckanext.ga_report.controller:GaPublisherReport', action='index')}">publishers</a> leaderboard</p>
     </li>
   </py:match>