Merge pull request #24 from datopian/dcat-form-updates

Update dataset form for latest DCAT change requests
datopian · Jul 19, 2024 · f791022 · f791022
2 parents ad86caa + 724a825
commit f791022
Show file tree

Hide file tree

Showing 12 changed files with 652 additions and 394 deletions.
diff --git a/ckanext/portalopendatadk/actions.py b/ckanext/portalopendatadk/actions.py
@@ -246,6 +246,9 @@ def package_create(context, data_dict):
             if not data_dict.get(field):
                 errors[field] = [_('Missing value')]
 
+    documentation = data_dict.get("documentation")
+    data_dict['url'] = documentation
+
     log.debug(
         'package_create validate_errs=%r user=%s package=%s data=%r',
         errors,
@@ -274,13 +277,13 @@ def package_create(context, data_dict):
 
     # We have to do this after save so the package id is available.
     # If this fails, we have to rollback the transaction.
-    try:
-        data_dict['url'] = data_dict.get('documentation')
-        upload = uploader.get_resource_uploader(data_dict)
-        upload.upload(pkg.id, uploader.get_max_resource_size())
-    except Exception as e:
-        model.Session.rollback()
-        raise ValidationError({'upload': [_('Documentation upload failed: {}').format(e)]})
+    if documentation and 'http' not in documentation:
+        try:
+            upload = uploader.get_resource_uploader(data_dict)
+            upload.upload(pkg.id, uploader.get_max_resource_size())
+        except Exception as e:
+            model.Session.rollback()
+            raise ValidationError({'upload': [_('Documentation upload failed: {}').format(e)]})
 
     # Needed to let extensions know the package and resources ids
     model.Session.flush()
@@ -406,12 +409,15 @@ def package_update(context, data_dict):
             if not data_dict.get(field):
                 errors[field] = [_('Missing value')]
 
-    try:
-        data_dict['url'] = data_dict.get('documentation')
-        upload = uploader.get_resource_uploader(data_dict)
-        upload.upload(data_dict['id'], uploader.get_max_resource_size())
-    except Exception as e:
-        errors['upload'] = [_('Upload failed: %s') % str(e)]
+    documentation = data_dict.get('documentation')
+    data_dict["url"] = documentation
+
+    if documentation and 'http' not in documentation:
+        try:
+            upload = uploader.get_resource_uploader(data_dict)
+            upload.upload(data_dict['id'], uploader.get_max_resource_size())
+        except Exception as e:
+            errors['upload'] = [_('Upload failed: %s') % str(e)]
 
     log.debug(
         'package_update validate_errs=%r user=%s package=%s data=%r',

diff --git a/ckanext/portalopendatadk/dcat/data_themes_skos.json b/ckanext/portalopendatadk/dcat/data_themes_skos.json
diff --git a/ckanext/portalopendatadk/dcat/dcat_info_text.json b/ckanext/portalopendatadk/dcat/dcat_info_text.json
@@ -14,5 +14,6 @@
   "url": "Distribution (mandatory): Provides a file or link to the resource (distribution) of the dataset. The property can appear once for each distribution.",
   "planned_availability": "Planned Availability (recommended): Specifies availability type of the resource (distribution). It can appear once for each distribution.",
   "license_id": "License (recommended): Specifies the license of the resource (distribution). It can appear once for each distribution.",
-  "format": "Format (mandatory if distribution exists): Specifies the file format of the resource (distribution). It can appear once for each distribution."
+  "format": "Format (mandatory if distribution exists): Specifies the file format of the resource (distribution). It can appear once for each distribution.",
+  "data_themes": "Data Themes (recommended): Specifies the Data Themes (Categories) of the dataset. Multiple Data Themes can be assigned to a dataset."
 }