Skip to content

Commit

Permalink
cleaner imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@tobes
tobes committed Feb 27, 2012
1 parent 04e5add commit 8255e38
Showing 1 changed file with 27 additions and 44 deletions.
71 changes: 27 additions & 44 deletions ckan/logic/action/get.py
View file
Expand Up @@ -15,38 +15,21 @@
from pylons import config
from ckan.authz import Authorizer
from ckan.lib.dictization import table_dictize
from ckan.lib.dictization.model_dictize import (package_dictize,
resource_list_dictize,
resource_dictize,
group_dictize,
group_list_dictize,
tag_dictize,
task_status_dictize,
user_dictize,
vocabulary_dictize,
vocabulary_list_dictize,
activity_list_dictize,
activity_detail_list_dictize)

from ckan.lib.dictization.model_dictize import (package_to_api1,
package_to_api2,
group_to_api1,
group_to_api2,
tag_to_api1,
tag_to_api2)

from ckan.lib.dictization import model_dictize
from ckan.lib.search import query_for, SearchError
from ckan.lib.base import render
from webhelpers.html import literal
from ckan.logic.action import get_domain_object
from lib.plugins import lookup_package_plugin
from ckan.lib.navl.dictization_functions import validate

log = logging.getLogger('ckan.logic')

def _package_list_with_resources(context, package_revision_list):
package_list = []
model = context["model"]
for package in package_revision_list:
result_dict = package_dictize(package,context)
result_dict = model_dictize.package_dictize(package,context)
package_list.append(result_dict)
return package_list

Expand Down Expand Up @@ -139,7 +122,7 @@ def group_list(context, data_dict):
if order_by == 'packages':
sort_by, reverse = 'packages', True

group_list = group_list_dictize(groups, context,
group_list = model_dictize.group_list_dictize(groups, context,
lambda x:x[sort_by], reverse)

if not all_fields:
Expand Down Expand Up @@ -227,7 +210,7 @@ def tag_list(context, data_dict):
if tags:
if all_fields:
for tag in tags:
result_dict = tag_dictize(tag, context)
result_dict = model_dictize.tag_dictize(tag, context)
tag_list.append(result_dict)
else:
tag_list.extend([tag.name for tag in tags])
Expand Down Expand Up @@ -288,7 +271,7 @@ def user_list(context, data_dict):
users_list = []

for user in query.all():
result_dict = user_dictize(user[0], context)
result_dict = model_dictize.user_dictize(user[0], context)
del result_dict['apikey']
users_list.append(result_dict)

Expand Down Expand Up @@ -367,7 +350,7 @@ def resource_show(context, data_dict):

logic.check_access('resource_show', context, data_dict)

return resource_dictize(resource, context)
return model_dictize.resource_dictize(resource, context)

def revision_show(context, data_dict):
model = context['model']
Expand Down Expand Up @@ -398,7 +381,7 @@ def group_show(context, data_dict):

logic.check_access('group_show',context, data_dict)

group_dict = group_dictize(group, context)
group_dict = model_dictize.group_dictize(group, context)

for item in PluginImplementations(IGroupController):
item.read(group)
Expand Down Expand Up @@ -437,7 +420,7 @@ def group_package_show(context, data_dict):

result = []
for pkg_rev in query.all():
result.append(package_dictize(pkg_rev, context))
result.append(model_dictize.package_dictize(pkg_rev, context))

return result

Expand All @@ -455,12 +438,12 @@ def tag_show(context, data_dict):

logic.check_access('tag_show',context, data_dict)

tag_dict = tag_dictize(tag,context)
tag_dict = model_dictize.tag_dictize(tag,context)

extended_packages = []
for package in tag_dict['packages']:
pkg = model.Package.get(package['id'])
extended_packages.append(package_dictize(pkg,context))
extended_packages.append(model_dictize.package_dictize(pkg,context))

tag_dict['packages'] = extended_packages

Expand All @@ -485,7 +468,7 @@ def user_show(context, data_dict):

logic.check_access('user_show',context, data_dict)

user_dict = user_dictize(user_obj,context)
user_dict = model_dictize.user_dictize(user_obj,context)

if not (Authorizer().is_sysadmin(unicode(user)) or user == user_obj.name):
# If not sysadmin or the same user, strip sensible info
Expand Down Expand Up @@ -526,9 +509,9 @@ def package_show_rest(context, data_dict):
pkg = context['package']

if api == '1':
package_dict = package_to_api1(pkg, context)
package_dict = model_dictize.package_to_api1(pkg, context)
else:
package_dict = package_to_api2(pkg, context)
package_dict = model_dictize.package_to_api2(pkg, context)

return package_dict

Expand All @@ -541,9 +524,9 @@ def group_show_rest(context, data_dict):
group = context['group']

if api == '2':
group_dict = group_to_api2(group, context)
group_dict = model_dictize.group_to_api2(group, context)
else:
group_dict = group_to_api1(group, context)
group_dict = model_dictize.group_to_api1(group, context)

return group_dict

Expand All @@ -556,9 +539,9 @@ def tag_show_rest(context, data_dict):
tag = context['tag']

if api == '2':
tag_dict = tag_to_api2(tag, context)
tag_dict = model_dictize.tag_to_api2(tag, context)
else:
tag_dict = tag_to_api1(tag, context)
tag_dict = model_dictize.tag_to_api1(tag, context)

return tag_dict

Expand Down Expand Up @@ -688,7 +671,7 @@ def package_search(context, data_dict):
log.warning('package %s in index but not in database' % package)
continue

result_dict = package_dictize(pkg,context)
result_dict = model_dictize.package_dictize(pkg,context)
results.append(result_dict)

count = query.count
Expand Down Expand Up @@ -873,7 +856,7 @@ def task_status_show(context, data_dict):

logic.check_access('task_status_show', context, data_dict)

task_status_dict = task_status_dictize(task_status, context)
task_status_dict = model_dictize.task_status_dictize(task_status, context)
return task_status_dict


Expand Down Expand Up @@ -991,7 +974,7 @@ def status_show(context, data_dict):
def vocabulary_list(context, data_dict):
model = context['model']
vocabulary_objects = model.Session.query(model.Vocabulary).all()
return vocabulary_list_dictize(vocabulary_objects, context)
return model_dictize.vocabulary_list_dictize(vocabulary_objects, context)

def vocabulary_show(context, data_dict):
model = context['model']
Expand All @@ -1001,7 +984,7 @@ def vocabulary_show(context, data_dict):
vocabulary = model.vocabulary.Vocabulary.get(vocab_id)
if vocabulary is None:
raise logic.NotFound(_('Could not find vocabulary "%s"') % vocab_id)
vocabulary_dict = vocabulary_dictize(vocabulary, context)
vocabulary_dict = model_dictize.vocabulary_dictize(vocabulary, context)
return vocabulary_dict

def user_activity_list(context, data_dict):
Expand All @@ -1013,7 +996,7 @@ def user_activity_list(context, data_dict):
query = query.order_by(desc(model.Activity.timestamp))
query = query.limit(15)
activity_objects = query.all()
return activity_list_dictize(activity_objects, context)
return model_dictize.activity_list_dictize(activity_objects, context)

def package_activity_list(context, data_dict):
'''Return a package\'s public activity stream as a list of dicts.'''
Expand All @@ -1024,7 +1007,7 @@ def package_activity_list(context, data_dict):
query = query.order_by(desc(model.Activity.timestamp))
query = query.limit(15)
activity_objects = query.all()
return activity_list_dictize(activity_objects, context)
return model_dictize.activity_list_dictize(activity_objects, context)

def group_activity_list(context, data_dict):
'''Return a group\'s public activity stream as a list of dicts.'''
Expand All @@ -1035,7 +1018,7 @@ def group_activity_list(context, data_dict):
query = query.order_by(desc(model.Activity.timestamp))
query = query.limit(15)
activity_objects = query.all()
return activity_list_dictize(activity_objects, context)
return model_dictize.activity_list_dictize(activity_objects, context)

def activity_detail_list(context, data_dict):
'''Return an activity\'s list of activity detail items, as a list of dicts.
Expand All @@ -1044,7 +1027,7 @@ def activity_detail_list(context, data_dict):
activity_id = data_dict['id']
activity_detail_objects = model.Session.query(
model.activity.ActivityDetail).filter_by(activity_id=activity_id).all()
return activity_detail_list_dictize(activity_detail_objects, context)
return model_dictize.activity_detail_list_dictize(activity_detail_objects, context)

def render_new_package_activity(context, activity):
return render('activity_streams/new_package.html',
Expand Down

0 comments on commit 8255e38

Please sign in to comment.