From: Ross Jones Date: Wed, 24 Oct 2012 10:53:29 +0000 Subject: Remembered to actually limit to the top 10 X-Git-Url: http://maxious.lambdacomplex.org/git/?p=ckanext-ga-report.git&a=commitdiff&h=02143fc67122fdfb799abe9ffd398f607d59260b --- Remembered to actually limit to the top 10 --- --- a/ckanext/ga_report/controller.py +++ b/ckanext/ga_report/controller.py @@ -1,10 +1,62 @@ import logging -from ckan.lib.base import BaseController, c, render -import report_model +import operator +from ckan.lib.base import BaseController, c, render,request + +import ckan.model as model +from ga_model import GA_Url log = logging.getLogger('ckanext.ga-report') class GaReport(BaseController): + def index(self): - return render('index.html') + return render('ga_report/site/index.html') + +class GaPublisherReport(BaseController): + """ + Displays the pageview and visit count for specific publishers based on + the datasets associated with the publisher. + """ + + def _get_month_name(self, str): + import calendar + from time import strptime + d = strptime('2012-10', '%Y-%m') + return '%s %s' % (calendar.month_name[d.tm_mon], d.tm_year) + + + def index(self, id): + c.publisher = model.Group.get(id) + c.top_packages = [] # package, dataset_views in c.top_packages + + # Get the month details by fetching distinct values and determining the + # month names from the values. + c.months = [] + vals = model.Session.query(GA_Url.period_name).distinct().all() + for m in vals: + c.months.append( (m[0],self._get_month_name(m))) + + # Sort the months, so most recent is at the head of our list + c.months = sorted(c.months, key=operator.itemgetter(0), reverse=True) + + # 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]) + + entry = model.Session.query(GA_Url).\ + filter(GA_Url.url=='/publisher/%s' % c.publisher.name).\ + filter(GA_Url.period_name==c.month).first() + c.publisher_page_views = entry.pageviews if entry else 0 + + entries = model.Session.query(GA_Url).\ + filter(GA_Url.department_id==c.publisher.name).\ + filter(GA_Url.period_name==c.month).\ + order_by('ga_url.pageviews desc')[:10] + for entry in entries: + if entry.url.startswith('/dataset/'): + p = model.Package.get(entry.url[len('/dataset/'):]) + c.top_packages.append((p,entry.pageviews,entry.visitors)) + + return render('ga_report/publisher/index.html') + --- a/ckanext/ga_report/plugin.py +++ b/ckanext/ga_report/plugin.py @@ -1,13 +1,14 @@ import logging import ckan.lib.helpers as h +import ckan.plugins as p from ckan.plugins import implements, toolkit -import gasnippet -import commands -import dbutil +#import gasnippet +#import commands +#import dbutil log = logging.getLogger('ckanext.ga-report') -class GoogleAnalyticsPlugin(p.SingletonPlugin): +class GAReportPlugin(p.SingletonPlugin): implements(p.IConfigurer, inherit=True) implements(p.IRoutes, inherit=True) @@ -17,8 +18,13 @@ def after_map(self, map): map.connect( - '/data/analytics/index', - controller='ckanext.ga-report.controller:GaReport', + '/data/analytics/', + controller='ckanext.ga_report.controller:GaReport', + action='index' + ) + map.connect( + '/data/analytics/publisher/{id}', + controller='ckanext.ga_report.controller:GaPublisherReport', action='index' ) return map --- /dev/null +++ b/ckanext/ga_report/templates/ga_report/publisher/index.html @@ -1,1 +1,51 @@ + + Analytics for ${g.site_title} + +
+

Analytics for ${c.publisher.title}

+ +

Most viewed datasets

+

Note: this data does not include API calls

+ +
+
+ + +
+
+ +

${c.publisher.title} dataset list was viewed ${c.publisher_page_views} times in ${c.month_desc}

+ + + + + + + + + + + + + + +
DatasetViewsVisits
${h.link_to(package.title or package.name, h.url_for(controller='package', action='read', id=package.name))} + ${views}${visits}
+ + +
+ + + + + + + --- /dev/null +++ b/ckanext/ga_report/templates/ga_report/site/index.html @@ -1,1 +1,1 @@ - +HAI Site --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ """ [ckan.plugins] # Add plugins here, eg - ga-report=ckanext.ga_report.plugin:GaReportPlugin + ga-report=ckanext.ga_report.plugin:GAReportPlugin [paste.paster_command] loadanalytics = ckanext.ga_report.command:LoadAnalytics