--- a/ckanext/ga_report/plugin.py +++ b/ckanext/ga_report/plugin.py @@ -2,6 +2,9 @@ import ckan.lib.helpers as h import ckan.plugins as p from ckan.plugins import implements, toolkit + +from ckanext.ga_report.helpers import (most_popular_datasets, + popular_datasets) log = logging.getLogger('ckanext.ga-report') @@ -19,29 +22,40 @@ A dictionary of extra helpers that will be available to provide ga report info to templates. """ - from ckanext.ga_report.helpers import most_popular_datasets return { - 'most_popular_datasets': most_popular_datasets + 'ga_report_installed': lambda: True, + 'popular_datasets': popular_datasets, + 'most_popular_datasets': most_popular_datasets, } def after_map(self, map): map.connect( - '/data/analytics/publisher', + '/data/site-usage/publisher', controller='ckanext.ga_report.controller:GaPublisherReport', action='index' ) map.connect( - '/data/analytics/publisher/{id}', + '/data/site-usage/publisher_{month}.csv', + controller='ckanext.ga_report.controller:GaPublisherReport', + action='csv' + ) + map.connect( + '/data/site-usage/publisher/{id}_{month}.csv', + controller='ckanext.ga_report.controller:GaPublisherReport', + action='publisher_csv' + ) + map.connect( + '/data/site-usage/publisher/{id}', controller='ckanext.ga_report.controller:GaPublisherReport', action='read' ) map.connect( - '/data/analytics', + '/data/site-usage', controller='ckanext.ga_report.controller:GaReport', action='index' ) map.connect( - '/data/analytics/data_{month}.csv', + '/data/site-usage/data_{month}.csv', controller='ckanext.ga_report.controller:GaReport', action='csv' )