From 65b17b029cbdaea377aad9b5acf5cd1bd486e168 Mon Sep 17 00:00:00 2001
From: Dennis Rupnow <2rupnow@informatik.uni-hamburg.de>
Date: Mon, 3 Dec 2018 16:21:22 +0100
Subject: [PATCH] changed extra-field 'access-right' to
'licenseAttributionByText'
---
ckanext/odsh/plugin.py | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/ckanext/odsh/plugin.py b/ckanext/odsh/plugin.py
index 55d2c75e..8bff67ac 100644
--- a/ckanext/odsh/plugin.py
+++ b/ckanext/odsh/plugin.py
@@ -203,23 +203,22 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
return ['title','notes']
def _extraFields(self):
- return ['issued', 'temporal_start', 'temporal_end', 'spatial_uri']
-
- def _extraFieldsOptional(self):
- return ['licenseAttributionByText']
+ return ['issued', 'temporal_start', 'temporal_end', 'spatial_uri', 'licenseAttributionByText']
def _update_schema(self,schema):
for field in self._extraFields():
- if field == 'spatial_uri':
+ if field == 'licenseAttributionByText':
schema.update({field: [
- toolkit.get_converter('not_empty'),
toolkit.get_validator('ignore_missing'),
+ toolkit.get_converter('convert_to_extras')]})
+ elif field == 'spatial_uri':
+ schema.update({field: [
+ toolkit.get_converter('not_empty'),
toolkit.get_converter('known_spatial_uri'),
toolkit.get_converter('convert_to_extras')]})
else:
schema.update({field: [
toolkit.get_converter('not_empty'),
- toolkit.get_validator('ignore_missing'),
toolkit.get_converter('convert_to_extras')]})
for field in self._fields():
schema.update({field: [toolkit.get_converter('not_empty')]})
@@ -240,7 +239,7 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
def show_package_schema(self):
schema = super(OdshPlugin, self).show_package_schema()
- for field in self._extraFields()+self._extraFieldsOptional():
+ for field in self._extraFields():
schema.update({
field : [toolkit.get_converter('convert_from_extras')]
})
--
GitLab