[#12] begin work on org harvest source controller
This commit is contained in:
kindly
parent
23aa45cc71
commit
ca2df234d2
|
|
@ -0,0 +1,221 @@
|
|||
import re
|
||||
import logging
|
||||
import genshi
|
||||
import datetime
|
||||
from urllib import urlencode
|
||||
|
||||
from ckan.lib.base import BaseController, c, model, request, render, h, g
|
||||
from ckan.lib.base import ValidationException, abort, gettext
|
||||
import ckan.lib.base as base
|
||||
from pylons.i18n import get_lang, _
|
||||
from ckan.lib.helpers import Page
|
||||
import ckan.lib.maintain as maintain
|
||||
from ckan.lib.navl.dictization_functions import DataError, unflatten, validate
|
||||
from ckan.logic import NotFound, NotAuthorized, ValidationError
|
||||
from ckan.logic import check_access, get_action
|
||||
from ckan.logic import tuplize_dict, clean_dict, parse_params
|
||||
import ckan.logic.action.get
|
||||
import ckan.lib.search as search
|
||||
import ckan.new_authz
|
||||
|
||||
from ckan.lib.plugins import lookup_group_plugin
|
||||
from ckan.controllers.group import GroupController
|
||||
import ckan.plugins as plugins
|
||||
|
||||
try:
|
||||
from collections import OrderedDict # 2.7
|
||||
except ImportError:
|
||||
from sqlalchemy.util import OrderedDict
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
class OrgController(GroupController):
|
||||
|
||||
def source_list(self, id, limit=20):
|
||||
group_type = self._get_group_type(id.split('@')[0])
|
||||
context = {'model': model, 'session': model.Session,
|
||||
'user': c.user or c.author,
|
||||
'schema': self._db_to_form_schema(group_type=group_type),
|
||||
'for_view': True}
|
||||
data_dict = {'id': id}
|
||||
|
||||
# unicode format (decoded from utf8)
|
||||
q = c.q = request.params.get('q', '')
|
||||
|
||||
try:
|
||||
c.group_dict = self._action('group_show')(context, data_dict)
|
||||
c.group = context['group']
|
||||
except NotFound:
|
||||
abort(404, _('Group not found'))
|
||||
except NotAuthorized:
|
||||
abort(401, _('Unauthorized to read group %s') % id)
|
||||
|
||||
self._read(id, limit, dataset_type='harvest_source')
|
||||
return render('source/org_source_list.html')
|
||||
|
||||
def _read(self, id, limit, dataset_type=None):
|
||||
''' This is common code used by both read and bulk_process'''
|
||||
group_type = self._get_group_type(id.split('@')[0])
|
||||
context = {'model': model, 'session': model.Session,
|
||||
'user': c.user or c.author,
|
||||
'schema': self._db_to_form_schema(group_type=group_type),
|
||||
'for_view': True, 'extras_as_string': True}
|
||||
|
||||
q = c.q = request.params.get('q', '')
|
||||
# Search within group
|
||||
q += ' groups: "%s"' % c.group_dict.get('name')
|
||||
|
||||
try:
|
||||
description_formatted = ckan.misc.MarkdownFormat().to_html(
|
||||
c.group_dict.get('description', ''))
|
||||
c.description_formatted = genshi.HTML(description_formatted)
|
||||
except Exception, e:
|
||||
error_msg = "<span class='inline-warning'>%s</span>" %\
|
||||
_("Cannot render description")
|
||||
c.description_formatted = genshi.HTML(error_msg)
|
||||
|
||||
context['return_query'] = True
|
||||
|
||||
# c.group_admins is used by CKAN's legacy (Genshi) templates only,
|
||||
# if we drop support for those then we can delete this line.
|
||||
c.group_admins = ckan.new_authz.get_group_or_org_admin_ids(c.group.id)
|
||||
|
||||
try:
|
||||
page = int(request.params.get('page', 1))
|
||||
except ValueError, e:
|
||||
abort(400, ('"page" parameter must be an integer'))
|
||||
|
||||
# most search operations should reset the page counter:
|
||||
params_nopage = [(k, v) for k, v in request.params.items()
|
||||
if k != 'page']
|
||||
#sort_by = request.params.get('sort', 'name asc')
|
||||
sort_by = request.params.get('sort', None)
|
||||
|
||||
def search_url(params):
|
||||
if group_type == 'organization':
|
||||
if c.action == 'bulk_process':
|
||||
url = self._url_for(controller='organization',
|
||||
action='bulk_process',
|
||||
id=id)
|
||||
else:
|
||||
url = self._url_for(controller='organization',
|
||||
action='read',
|
||||
id=id)
|
||||
else:
|
||||
url = self._url_for(controller='group', action='read',
|
||||
id=id)
|
||||
params = [(k, v.encode('utf-8') if isinstance(v, basestring)
|
||||
else str(v)) for k, v in params]
|
||||
return url + u'?' + urlencode(params)
|
||||
|
||||
def drill_down_url(**by):
|
||||
return h.add_url_param(alternative_url=None,
|
||||
controller='group', action='read',
|
||||
extras=dict(id=c.group_dict.get('name')),
|
||||
new_params=by)
|
||||
|
||||
c.drill_down_url = drill_down_url
|
||||
|
||||
def remove_field(key, value=None, replace=None):
|
||||
return h.remove_url_param(key, value=value, replace=replace,
|
||||
controller='group', action='read',
|
||||
extras=dict(id=c.group_dict.get('name')))
|
||||
|
||||
c.remove_field = remove_field
|
||||
|
||||
def pager_url(q=None, page=None):
|
||||
params = list(params_nopage)
|
||||
params.append(('page', page))
|
||||
return search_url(params)
|
||||
|
||||
try:
|
||||
c.fields = []
|
||||
search_extras = {}
|
||||
for (param, value) in request.params.items():
|
||||
if not param in ['q', 'page', 'sort'] \
|
||||
and len(value) and not param.startswith('_'):
|
||||
if not param.startswith('ext_'):
|
||||
c.fields.append((param, value))
|
||||
q += ' %s: "%s"' % (param, value)
|
||||
else:
|
||||
search_extras[param] = value
|
||||
|
||||
fq = 'capacity:"public"'
|
||||
user_member_of_orgs = [org['id'] for org
|
||||
in h.organizations_available('read')]
|
||||
|
||||
if (c.group and c.group.id in user_member_of_orgs):
|
||||
fq = ''
|
||||
context['ignore_capacity_check'] = True
|
||||
|
||||
facets = OrderedDict()
|
||||
|
||||
default_facet_titles = {'groups': _('Groups'),
|
||||
'tags': _('Tags'),
|
||||
'res_format': _('Formats'),
|
||||
'license': _('Licence'), }
|
||||
|
||||
for facet in g.facets:
|
||||
if facet in default_facet_titles:
|
||||
facets[facet] = default_facet_titles[facet]
|
||||
else:
|
||||
facets[facet] = facet
|
||||
|
||||
if dataset_type:
|
||||
fq = fq + 'dataset_type:"{dataset_type}"'.format(dataset_type=dataset_type)
|
||||
|
||||
# Facet titles
|
||||
for plugin in plugins.PluginImplementations(plugins.IFacets):
|
||||
if self.group_type == 'organization':
|
||||
facets = plugin.organization_facets(
|
||||
facets, self.group_type, dataset_type)
|
||||
else:
|
||||
facets = plugin.group_facets(
|
||||
facets, self.group_type, dataset_type)
|
||||
|
||||
if 'capacity' in facets and (self.group_type != 'organization' or not user_member_of_orgs):
|
||||
del facets['capacity']
|
||||
|
||||
c.facet_titles = facets
|
||||
|
||||
data_dict = {
|
||||
'q': q,
|
||||
'fq': fq,
|
||||
'facet.field': facets.keys(),
|
||||
'rows': limit,
|
||||
'sort': sort_by,
|
||||
'start': (page - 1) * limit,
|
||||
'extras': search_extras
|
||||
}
|
||||
|
||||
query = get_action('package_search')(context, data_dict)
|
||||
|
||||
c.page = h.Page(
|
||||
collection=query['results'],
|
||||
page=page,
|
||||
url=pager_url,
|
||||
item_count=query['count'],
|
||||
items_per_page=limit
|
||||
)
|
||||
|
||||
c.facets = query['facets']
|
||||
maintain.deprecate_context_item(
|
||||
'facets',
|
||||
'Use `c.search_facets` instead.')
|
||||
|
||||
c.search_facets = query['search_facets']
|
||||
c.search_facets_limits = {}
|
||||
for facet in c.facets.keys():
|
||||
limit = int(request.params.get('_%s_limit' % facet, 10))
|
||||
c.search_facets_limits[facet] = limit
|
||||
c.page.items = query['results']
|
||||
|
||||
c.sort_by_selected = sort_by
|
||||
|
||||
except search.SearchError, se:
|
||||
log.error('Group search error: %r', se.args)
|
||||
c.query_error = True
|
||||
c.facets = {}
|
||||
c.page = h.Page(collection=[])
|
||||
|
||||
|
||||
|
|
@ -219,6 +219,8 @@ class Harvest(p.SingletonPlugin, DefaultDatasetForm):
|
|||
map.connect('harvest_job_show_last', '/' + DATASET_TYPE_NAME + '/{source}/job/last', controller=controller, action='show_last_job')
|
||||
map.connect('harvest_job_show', '/' + DATASET_TYPE_NAME + '/{source}/job/{id}', controller=controller, action='show_job')
|
||||
|
||||
org_controller = 'ckanext.harvest.controllers.org:OrgController'
|
||||
map.connect('harvest_job_org_list', '/organization/' + DATASET_TYPE_NAME + '_list/' + '{id}', controller=org_controller, action='source_list')
|
||||
|
||||
return map
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
|
||||
{% extends 'organization/read.html' %}
|
||||
Loading…
Reference in New Issue