#285 Improve schema extensibility - fix

geosolutions-it · Apr 12, 2022 · c8edf37 · c8edf37
1 parent fe52399
commit c8edf37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/ckanext/dcatapit/helpers.py b/ckanext/dcatapit/helpers.py
@@ -366,11 +366,12 @@ def get_icustomschema_fields():
 def get_icustomschema_org_fields():
     out = []
     for plugin in PluginImplementations(interfaces.ICustomSchema):
-        extra_schema = plugin.get_custom_org_schema()
+        if hasattr(plugin, 'get_custom_org_schema'):
+            extra_schema = plugin.get_custom_org_schema()
 
-        for extra in extra_schema:
-            extra['external'] = True
-        out.extend(extra_schema)
+            for extra in extra_schema:
+                extra['external'] = True
+            out.extend(extra_schema)
     return out
 
 

diff --git a/ckanext/dcatapit/schema.py b/ckanext/dcatapit/schema.py
@@ -363,12 +363,13 @@ def get_custom_package_schema():
 
 def _update_schema_fields(package_schema: dict):
     for plugin in PluginImplementations(ICustomSchema):
-        schema_updates = plugin.get_schema_updates()
-        for field in package_schema:
-            if field['name'] in schema_updates:
-                log.debug(f'Plugin {plugin} updating schema field "{field["name"]}"')
-                field.update(schema_updates[field['name']])
-                field['tainted'] = True
+        if hasattr(plugin, 'get_schema_updates'):
+            schema_updates = plugin.get_schema_updates()
+            for field in package_schema:
+                if field['name'] in schema_updates:
+                    log.debug(f'Plugin {plugin} updating schema field "{field["name"]}"')
+                    field.update(schema_updates[field['name']])
+                    field['tainted'] = True
 
 
 def get_custom_resource_schema():