start refactor validation

ckanext/odsh/helpers.py

@@ -160,6 +160,8 @@ def odsh_extract_error(key, errors, field='extras'):
                     return error.replace(key+':', '')
 
 def odsh_extract_error_new(key, errors):
+    print('ERRORS')
+    print(errors)
     if not errors or not ('__extras' in errors):
         return None
     error = errors['__extras'][0].get(key,None)

ckanext/odsh/i18n/de/LC_MESSAGES/ckanext-odsh.po

@@ -207,10 +207,16 @@ msgstr "Bitte geben Sie einen Titel ein"
 msgid "odsh_issued_error_label"
 msgstr "Bitte wählen Sie ein Veröffentlichungsdatum"
 
+msgid "issued: empty"
+msgstr "Bitte wählen Sie ein Veröffentlichungsdatum"
+
 
 msgid "odsh_issued_not_date_error_label"
 msgstr "Bitte wählen Sie ein korrektes Veröffentlichungsdatum"
 
+msgid "issued: not a valid date"
+msgstr "Bitte wählen Sie ein korrektes Veröffentlichungsdatum"
+
 msgid "Tag string: Fehlender Wert"
 msgstr "Bitte wählen Sie geeignete Schlagwörter"
 

ckanext/odsh/plugin.py

@@ -253,7 +253,6 @@ class OdshPlugin(plugins.SingletonPlugin, DefaultTranslation, DefaultDatasetForm
 
         schema['extras'].update({
             'key': [
-                toolkit.get_converter('odsh_validate_issued'),
                 toolkit.get_converter('odsh_validate_temporal_start'),
                 toolkit.get_converter('odsh_validate_temporal_end'),
                 toolkit.get_converter('known_spatial_uri'),

ckanext/odsh/templates/package/snippets/package_basic_fields.html

@@ -158,8 +158,8 @@ is_required=true,placeholder=_('Enter title')) }}
 
     {% set field = 'issued' %}
     {% set data_issued = h.odsh_extract_value_from_extras(data.extras,field) %}
-    {% set value = data_issued.split('T')[0] if data_issued else h.odsh_now()%}
-    {% set error = h.odsh_extract_error(field, errors) %}
+    {% set error = h.odsh_extract_error_new(field, errors) %}
+    {% set value = data_issued.split('T')[0] if data_issued else (h.odsh_now() if not error else '')%}
     <div class="control-group {{ " error" if error }} control-full">
         <label class="control-label" for="field-{{field}}">Veröffentlichungsdatum: <span title="Dieses Feld ist erforderlich" class="control-required">*</span> </label>
         <div class="controls">
@@ -172,7 +172,7 @@ is_required=true,placeholder=_('Enter title')) }}
                 </div>
                 <div class="span6 inline-error">
                     {% if error %} 
-                    {{_(error)}}
+                    {{_('issued: ' + error)}}
                     {% endif %}
                 </div>
             </div>

ckanext/odsh/validation.py

@@ -24,7 +24,7 @@ def _extract_value(data, field):
 def validate_extra_groups(data):
     value = _extract_value(data, 'groups')
     if not value:
-        raise toolkit.Invalid({'groups':'at least one group needed'})
+        return 'at least one group needed'
 
     groups = [g.strip() for g in value.split(',') if value.strip()]
     for k in data.keys():
@@ -32,13 +32,24 @@ def validate_extra_groups(data):
             data[k]=''
             # del data[k]
     if len(groups)==0:
-        raise toolkit.Invalid({'groups':'at least one group needed'})
+        return 'at least one group needed'
 
     for num, tag in zip(range(len(groups)), groups):
         data[('groups', num, 'id')] = tag
 
 def validate_extras(key, data, errors, context):
-    validate_extra_groups(data)
+    pass
+    extra_errors = {}
+    error = validate_extra_groups(data)
+    if error:
+        extra_errors['groups'] = error
+
+    error = validate_extra_date_new(key, 'issued', data, False)
+    if error:
+        extra_errors['issued'] = error
+
+    if extra_errors:
+        raise toolkit.Invalid(extra_errors)
 
 def _set_value(data, field, value):
     key = None
@@ -50,12 +61,32 @@ def _set_value(data, field, value):
         return None
     data[(key[0], key[1], 'value')] = value
 
-def validate_extra_date(key, field, data, errors, context):
+def validate_extra_date_new(key, field, data, optional=False):
+    value = _extract_value(data, field)
+
+    if not value:
+        if optional:
+            return 
+        # Statistikamt Nord does not always provide temporal_start/end,
+        # but their datasets have to be accepted as they are.
+        if not ('id',) in data or data[('id',)][:7] != 'StaNord':
+            return 'empty'
+    else:
+        if re.match(r'\d\d\d\d-\d\d-\d\d', value):
+            try:
+                dt=parse(value)
+                _set_value(data, field, dt.isoformat())
+                return
+            except ValueError:
+                pass
+        return 'not a valid date'
+
+def validate_extra_date(key, field, data, optional=False):
     value = _extract_value(data, field)
 
     if not value:
-        if field == 'temporal_end':
-            return # temporal_end is optional
+        if optional:
+            return 
         # Statistikamt Nord does not always provide temporal_start/end,
         # but their datasets have to be accepted as they are.
         if not ('id',) in data or data[('id',)][:7] != 'StaNord':
@@ -71,8 +102,8 @@ def validate_extra_date(key, field, data, errors, context):
         raise toolkit.Invalid(field+':odsh_'+field+'_not_date_error_label')
 
 
-def validate_extra_date_factory(field):
-    return lambda key, data, errors, context: validate_extra_date(key, field, data, errors, context)
+def validate_extra_date_factory(field, optional=False):
+    return lambda key, data, errors, context: validate_extra_date(key, field, data, optional)
 
 def validate_licenseAttributionByText(key, data, errors, context):
     register = model.Package.get_license_register()
@@ -172,9 +203,8 @@ def get_validators():
     return {
             'licenseAttributionByText': validate_licenseAttributionByText,
             'known_spatial_uri': known_spatial_uri,
-            'odsh_validate_issued': validate_extra_date_factory('issued'),
             'odsh_validate_temporal_start': validate_extra_date_factory('temporal_start'),
-            'odsh_validate_temporal_end': validate_extra_date_factory('temporal_end'),
+            'odsh_validate_temporal_end': validate_extra_date_factory('temporal_end', True),
             'odsh_tag_name_validator': tag_name_validator,
             'odsh_validate_extras':validate_extras
             }
\ No newline at end of file