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

Merge branch 'release-v2.0' of github.com:okfn/ckanext-harvest into release-v2.0

This commit is contained in:
amercader 2013-04-08 13:25:33 +01:00
parent 5414b6c08d 66ff773f99
commit eaebeb4e6e
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ckanext/harvest/model/__init__.py
View File

@ -407,6 +407,13 @@ ALTER TABLE harvest_object_error
Session.commit() Session.commit()
log.info('Harvest tables migrated to v3') log.info('Harvest tables migrated to v3')
class PackageIdHarvestSourceIdMismatch(Exception):
"""
The package created for the harvest source must match the id of the
harvest source
"""
pass
def migrate_v3_create_datasets(): def migrate_v3_create_datasets():
import pylons import pylons
from paste.registry import Registry from paste.registry import Registry
@ -465,15 +472,15 @@ def migrate_v3_create_datasets():
'source_type': source.type, 'source_type': source.type,
'config': source.config, 'config': source.config,
'frequency': source.frequency, 'frequency': source.frequency,
'author_email': '',
'license_id': '',
'maintainer_email': '',
'maintainer': '',
'author': ''
} }
context['message'] = 'Created package for harvest source {0}'.format(source.id) context['message'] = 'Created package for harvest source {0}'.format(source.id)
try: try:
logic.get_action('package_create')(context, package_dict) new_package_id = logic.get_action('package_create')(context, package_dict)
if new_package_id != source.id or not context['return_id_only']:
# this check only makes sense if we are sure we are returning
# the package id not the package object
raise PackageIdHarvestSourceIdMismatch
log.info('Created new package for source {0} ({1})'.format(source.id, source.url)) log.info('Created new package for source {0} ({1})'.format(source.id, source.url))
except logic.ValidationError,e: except logic.ValidationError,e:
log.error('Validation Error: %s' % str(e.error_summary)) log.error('Validation Error: %s' % str(e.error_summary))