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

Updated harvest source url validator to allow for duplicate URL's with 

unique configs.
This commit is contained in:
Mark Winterbottom 2015-10-30 11:59:24 +00:00
parent 2c41293c9c
commit 55325f5940
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,10 +74,8 @@ def harvest_source_url_validator(key, data, errors, context):
try: try:
new_config = data.get(key[:-1] + ('config',)) new_config = data.get(key[:-1] + ('config',))
new_config_dict = json.loads(new_config)
new_config_set = new_config_dict.get('set', None)
except: except:
new_config_set = None new_config = None
new_url = _normalize_url(data[key]) new_url = _normalize_url(data[key])
@ -93,13 +91,8 @@ def harvest_source_url_validator(key, data, errors, context):
for url, conf in existing_sources: for url, conf in existing_sources:
url = _normalize_url(url) url = _normalize_url(url)
try:
config_dict = json.loads(conf)
config_set = config_dict.get('set', None)
except:
config_set = None
if url == new_url and config_set == new_config_set: if url == new_url and conf == new_config:
# You can have a duplicate URL if it's pointing to a unique # You can have a duplicate URL if it's pointing to a unique
# set as it will be harvesting unique datasets. # set as it will be harvesting unique datasets.
raise Invalid( raise Invalid(