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

[#76] Add extra fields to the source schema 

Add 'private' and its core validators, and 'metadata_modified' and
'metadata_created'.

Also ignore '__extras'
This commit is contained in:
amercader 2014-01-14 17:01:25 +00:00
parent 467fb7bb8f
commit 95d0ef0f01
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ckanext/harvest/logic/schema.py
View File

@ -1,9 +1,12 @@
import ckan.plugins as p
from ckan.logic.schema import default_extras_schema from ckan.logic.schema import default_extras_schema
from ckan.logic.validators import (package_id_exists, from ckan.logic.validators import (package_id_exists,
name_validator, name_validator,
owner_org_validator, owner_org_validator,
package_name_validator, package_name_validator,
ignore_not_package_admin, ignore_not_package_admin,
boolean_validator,
) )
from ckan.logic.converters import convert_to_extras, convert_from_extras from ckan.logic.converters import convert_to_extras, convert_from_extras
@ -36,6 +39,7 @@ def harvest_source_schema():
'title': [if_empty_same_as("name"), unicode], 'title': [if_empty_same_as("name"), unicode],
'notes': [ignore_missing, unicode], 'notes': [ignore_missing, unicode],
'owner_org': [owner_org_validator, unicode], 'owner_org': [owner_org_validator, unicode],
'private': [ignore_missing, boolean_validator],
'organization': [ignore_missing], 'organization': [ignore_missing],
'frequency': [ignore_missing, unicode, harvest_source_frequency_exists, convert_to_extras], 'frequency': [ignore_missing, unicode, harvest_source_frequency_exists, convert_to_extras],
'state': [ignore_missing], 'state': [ignore_missing],
@ -48,6 +52,11 @@ def harvest_source_schema():
schema['extras'] = extras_schema schema['extras'] = extras_schema
if p.toolkit.check_ckan_version('2.2'):
from ckan.logic.validators import datasets_with_no_organization_cannot_be_private
schema['private'].append(datasets_with_no_organization_cannot_be_private)
return schema return schema
def harvest_source_create_package_schema(): def harvest_source_create_package_schema():
@ -73,9 +82,13 @@ def harvest_source_show_package_schema():
'source_type': [convert_from_extras, ignore_missing], 'source_type': [convert_from_extras, ignore_missing],
'frequency': [convert_from_extras, ignore_missing], 'frequency': [convert_from_extras, ignore_missing],
'config': [convert_from_extras, harvest_source_convert_from_config, ignore_missing], 'config': [convert_from_extras, harvest_source_convert_from_config, ignore_missing],
'owner_org': [ignore_missing] 'owner_org': [ignore_missing],
'metadata_created': [],
'metadata_modified': [],
}) })
schema['__extras'] = [ignore]
return schema return schema
def harvest_object_create_schema(): def harvest_object_create_schema():