CatalogueRevamping
/
harvester-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use get_action function instead of directly calling the action functions

This commit is contained in:
Adrià Mercader 2011-10-26 17:26:18 +01:00
parent 31dac7029a
commit c04d80e27e
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ckanext/harvest/harvesters/base.py
View File

@ -3,10 +3,8 @@ import logging
from ckan import model from ckan import model
from ckan.model import Session, Package from ckan.model import Session, Package
from ckan.logic import ValidationError, NotFound from ckan.logic import ValidationError, NotFound, get_action
from ckan.logic.action.create import package_create_rest
from ckan.logic.action.update import package_update_rest
from ckan.logic.action.get import package_show
from ckan.logic.schema import default_package_schema from ckan.logic.schema import default_package_schema
from ckan.lib.navl.validators import ignore_missing from ckan.lib.navl.validators import ignore_missing
from ckan.lib.munge import munge_title_to_name, munge_tag from ckan.lib.munge import munge_title_to_name, munge_tag
@ -125,14 +123,14 @@ class HarvesterBase(SingletonPlugin):
data_dict = {} data_dict = {}
data_dict['id'] = package_dict['id'] data_dict['id'] = package_dict['id']
try: try:
existing_package_dict = package_show(context, data_dict) existing_package_dict = get_action('package_show')(context, data_dict)
# Check modified date # Check modified date
if not 'metadata_modified' in package_dict or \ if not 'metadata_modified' in package_dict or \
package_dict['metadata_modified'] > existing_package_dict.get('metadata_modified'): package_dict['metadata_modified'] > existing_package_dict.get('metadata_modified'):
log.info('Package with GUID %s exists and needs to be updated' % harvest_object.guid) log.info('Package with GUID %s exists and needs to be updated' % harvest_object.guid)
# Update package # Update package
context.update({'id':package_dict['id']}) context.update({'id':package_dict['id']})
updated_package = package_update_rest(context, package_dict) updated_package = get_action('package_update_rest')(context, package_dict)
harvest_object.package_id = updated_package['id'] harvest_object.package_id = updated_package['id']
harvest_object.save() harvest_object.save()
@ -146,7 +144,7 @@ class HarvesterBase(SingletonPlugin):
package_dict['name'] = self._check_name(package_dict['name']) package_dict['name'] = self._check_name(package_dict['name'])
log.info('Package with GUID %s does not exist, let\'s create it' % harvest_object.guid) log.info('Package with GUID %s does not exist, let\'s create it' % harvest_object.guid)
new_package = package_create_rest(context, package_dict) new_package = get_action('package_create_rest')(context, package_dict)
harvest_object.package_id = new_package['id'] harvest_object.package_id = new_package['id']
harvest_object.save() harvest_object.save()