fix copy pasta error
--- a/ckanext/dga_stats/controller.py
+++ b/ckanext/dga_stats/controller.py
@@ -12,11 +12,12 @@
c.top_rated_packages = stats.top_rated_packages()
c.most_edited_packages = stats.most_edited_packages()
c.largest_groups = stats.largest_groups()
- c.top_tags = stats.top_tags()
c.top_package_owners = stats.top_package_owners()
c.summary_stats = stats.summary_stats()
c.activity_counts = stats.activity_counts()
c.by_org = stats.by_org()
+ c.res_by_org = stats.res_by_org()
+ c.top_active_orgs = stats.top_active_orgs()
c.user_access_list = stats.user_access_list()
c.recent_datasets = stats.recent_datasets()
c.new_packages_by_week = rev_stats.get_by_week('new_packages')
--- a/ckanext/dga_stats/stats.py
+++ b/ckanext/dga_stats/stats.py
@@ -6,6 +6,8 @@
import ckan.plugins as p
import ckan.model as model
+
+import re
cache_enabled = p.toolkit.asbool(config.get('ckanext.stats.cache_enabled', 'True'))
@@ -70,6 +72,7 @@
def by_org(cls, limit=10):
connection = model.Session.connection()
res = connection.execute("select package.owner_org, package.private, count(*) from package \
+ inner join (select distinct package_id from resource_group inner join resource on resource.resource_group_id = resource_group.id) as r on package.id = r.package_id \
inner join \"group\" on package.owner_org = \"group\".id \
where package.state='active'\
group by package.owner_org,\"group\".name, package.private \
@@ -78,30 +81,43 @@
return res_groups
@classmethod
- def top_tags(cls, limit=10, returned_tag_info='object'): # by package
- assert returned_tag_info in ('name', 'id', 'object')
- tag = table('tag')
- package_tag = table('package_tag')
- package = table('package')
- #TODO filter out tags with state=deleted
- if returned_tag_info == 'name':
- from_obj = [package_tag.join(tag)]
- tag_column = tag.c.name
- else:
- from_obj = None
- tag_column = package_tag.c.tag_id
- s = select([tag_column, func.count(package_tag.c.package_id)],
- from_obj=from_obj)
- s = s.group_by(tag_column).\
- where(package.c.private == 'f').\
- order_by(func.count(package_tag.c.package_id).desc()).\
- limit(limit)
- res_col = model.Session.execute(s).fetchall()
- if returned_tag_info in ('id', 'name'):
- return res_col
- elif returned_tag_info == 'object':
- res_tags = [(model.Session.query(model.Tag).get(unicode(tag_id)), val) for tag_id, val in res_col]
- return res_tags
+ def res_by_org(cls, limit=10):
+ connection = model.Session.connection()
+ reses = connection.execute("select owner_org,format,count(*) from \
+ resource inner join resource_group on resource.resource_group_id = resource_group.id \
+ inner join package on resource_group.package_id = package.id group by owner_org,format order by count desc;").fetchall();
+ group_ids = []
+ group_tab = {}
+ group_spatial = {}
+ group_other = {}
+ for group_id,format,count in reses:
+ if group_id not in group_ids:
+ group_ids.append(group_id)
+ group_tab[group_id] = 0
+ group_spatial[group_id] = 0
+ group_other[group_id] = 0
+ if re.search('xls|csv|ms-excel|spreadsheetml.sheet|zip|netcdf',format, re.IGNORECASE):
+ group_tab[group_id] = group_tab[group_id] + count
+ elif re.search('wms|wfs|wcs|shp|kml|kmz',format, re.IGNORECASE):
+ group_spatial[group_id] = group_spatial[group_id] + count
+ else:
+ group_other[group_id] = group_other[group_id] + count
+ return [(model.Session.query(model.Group).get(unicode(group_id)), group_tab[group_id],group_spatial[group_id],group_other[group_id], group_tab[group_id]+group_spatial[group_id]+group_other[group_id]) for group_id in group_ids]
+
+ @classmethod
+ def top_active_orgs(cls, limit=10):
+ connection = model.Session.connection()
+ res = connection.execute("select package.owner_org, count(*) from package \
+ inner join (select distinct package_id from resource_group inner join resource on resource.resource_group_id = resource_group.id) as r on package.id = r.package_id \
+ inner join \"group\" on package.owner_org = \"group\".id \
+ inner join (select distinct object_id from activity where activity.timestamp > (now() - interval '60 day')) \
+ latestactivities on latestactivities.object_id = package.id \
+ where package.state='active' \
+ and package.private = 'f' \
+ group by package.owner_org \
+ order by count(*) desc;").fetchall();
+ res_groups = [(model.Session.query(model.Group).get(unicode(group_id)), val) for group_id, val in res]
+ return res_groups
@classmethod
def top_package_owners(cls, limit=10):
@@ -124,11 +140,10 @@
connection = model.Session.connection()
res = connection.execute("SELECT 'Total Organisations', count(*) from \"group\" where type = 'organization' and state = 'active' union \
- select 'Total Datasets', count(*) from package where (state='active' or state='draft' or state='draft-complete') and private = 'f' union \
+ select 'Total Datasets', count(*) from package inner join (select distinct package_id from resource_group inner join resource on resource.resource_group_id = resource_group.id) as r on package.id = r.package_id where (package.state='active' or package.state='draft' or package.state='draft-complete') and private = 'f' union \
select 'Total Archived Datasets', count(*) from package where (state='active' or state='draft' or state='draft-complete') and private = 't' union \
select 'Total Data Files/Resources', count(*) from resource where state='active' union \
- select 'Total Machine Readable/Data API Resources', count(*) from resource where state='active' and webstore_url = 'active'\
- ").fetchall();
+ select 'Total Machine Readable/Data API Resources', count(*) from resource where state='active' and (webstore_url = 'active' or format='wms')").fetchall();
return res
--- a/ckanext/dga_stats/templates/ckanext/stats/index.html
+++ b/ckanext/dga_stats/templates/ckanext/stats/index.html
@@ -185,7 +185,7 @@
<table class="table table-chunky table-bordered table-striped">
<thead>
<tr>
- <th>{{ _('Group') }}</th>
+ <th>{{ _('Organisation') }}</th>
<th>{{ _('Public/Archived') }}</th>
<th class="metric">{{ _('Number of datasets') }}</th>
</tr>
@@ -203,6 +203,58 @@
<td class="metric">{{ num_packages }}</td>
</tr>
{% endif %}
+ {% endfor %}
+ </tbody>
+ </table>
+ {% else %}
+ <p class="empty">{{ _('No groups') }}</p>
+ {% endif %}
+ </section>
+ <section id="stats-res-by-org" class="module-content tab-content">
+ <h2>{{ _('Resources by Organization') }}</h2>
+ {% if c.res_by_org %}
+ <table class="table table-chunky table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>{{ _('Organisation') }}</th>
+ <th>{{ _('Tabular') }}</th>
+ <th>{{ _('Spatial') }}</th>
+ <th>{{ _('Other') }}</th>
+ <th class="metric">{{ _('Total') }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for group,t,s,o,tot in c.res_by_org %}
+ <tr>
+ <td>{{ h.link_to(group.title or group.name, h.url_for(controller='organization', action='read', id=group.name)) }}</td>
+ <td>{{ t }}</td>
+ <td>{{ s }}</td>
+ <td>{{ o }}</td>
+ <td class="metric">{{ tot }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% else %}
+ <p class="empty">{{ _('No groups') }}</p>
+ {% endif %}
+ </section>
+ <section id="stats-activity-org" class="module-content tab-content">
+ <h2>{{ _('Most Active Organisations') }}</h2>
+ {% if c.top_active_orgs %}
+ <table class="table table-chunky table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>{{ _('Organisation') }}</th>
+ <th class="metric">{{ _('Number of datasets updated recently') }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for group, num_packages in c.top_active_orgs %}
+ <tr>
+ <td>{{ h.link_to(group.title or group.name, h.url_for(controller='organization', action='read', id=group.name)) }}</td>
+ <td class="metric">{{ num_packages }}</td>
+ </tr>
{% endfor %}
</tbody>
</table>
@@ -251,6 +303,9 @@
<li class="nav-item"><a href="#stats-dataset-revisions" data-toggle="tab">{{ _('Dataset Revisions per Week') }}</a></li>
<li class="nav-item"><a href="#stats-most-edited" data-toggle="tab">{{ _('Most Edited Datasets') }}</a></li>
<li class="nav-item"><a href="#stats-by-org" data-toggle="tab">{{ _('Datasets by Organization') }}</a></li>
+ <li class="nav-item"><a href="#stats-res-by-org" data-toggle="tab">{{ _('Resources by Organization') }}</a></li>
+ <li class="nav-item"><a href="#stats-activity-org" data-toggle="tab">{{ _('Most Active Organisations') }}</a></li>
+ <li class="nav-item"><a href="//data.gov.au/site-usage">Site Analytics</a></li>
<li class="nav-item active"><a href="#stats-summary" data-toggle="tab">{{ _('Summary') }}</a></li>
</ul>
</nav>