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

Merge branch 'validator-raise'

This commit is contained in:
amercader 2015-12-10 13:16:26 +00:00
parent 4cc39e5ef4 4fbaec0986
commit 072698b4bb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ckanext/harvest/logic/validators.py
View File

@ -34,6 +34,9 @@ def harvest_job_exists(value, context):
def _normalize_url(url): def _normalize_url(url):
'''Strips off parameters off a URL, and an unnecessary port number, so that
simple variations on a URL are ignored, to used to help avoid getting two
harvesters for the same URL.'''
o = urlparse.urlparse(url) o = urlparse.urlparse(url)
# Normalize port # Normalize port
@ -118,8 +121,8 @@ def harvest_source_type_exists(value, context):
available_types.append(info['name']) available_types.append(info['name'])
if not value in available_types: if not value in available_types:
raise Invalid('Unknown harvester type: %s. Have you registered a ' raise Invalid('Unknown harvester type: %s. Registered types: %r' %
'harvester for this type?' % value) (value, available_types))
return value return value