Fixed #449 url check in DataDownload

pangaea-data-publisher · Nov 2, 2023 · f6e6c96 · f6e6c96
1 parent 9519c3b
commit f6e6c96
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/fuji_server/helper/metadata_collector_rdf.py b/fuji_server/helper/metadata_collector_rdf.py
@@ -966,7 +966,12 @@ def get_schemaorg_metadata_from_graph(self, graph):
             )
             schema_metadata["object_content_identifier"] = []
             for dist in distribution:
-                durl = graph.value(dist, SMA.contentUrl) or graph.value(dist, SDO.contentUrl)
+                durl = (
+                    graph.value(dist, SMA.contentUrl)
+                    or graph.value(dist, SMA.url)
+                    or graph.value(dist, SDO.contentUrl)
+                    or graph.value(dist, SDO.url)
+                )
                 dtype = graph.value(dist, SMA.encodingFormat) or graph.value(dist, SDO.encodingFormat)
                 dsize = graph.value(dist, SMA.contentSize) or graph.value(dist, SDO.contentSize)
                 if durl or dtype or dsize:

diff --git a/fuji_server/helper/metadata_mapper.py b/fuji_server/helper/metadata_mapper.py
@@ -233,7 +233,7 @@ def flip_dict(dict_to_flip):
         '{related_resource: (isBasedOn."@id" || isBasedOn[0]."@id" || isBasedOn.url || isBasedOn[0].url || isBasedOn) , relation_type: \'isBasedOn\'} , '
         '{related_resource: "@reverse".isBasedOn[0]."@id" || "@reverse".isBasedOn."@id" || "@reverse".isBasedOn[0].url || isBasedOn , relation_type: \'isBasisFor\'},'
         '{related_resource: (citation."@id" || citation[0]."@id" || citation.url || citation[0].url || citation.name || citation[0].name  || citation), relation_type:\'references\'} ], '
-        "object_content_identifier: (distribution[*].{url: contentUrl, type: (encodingFormat || fileFormat), size: (contentSize || fileSize), profile: schemaVersion} || [distribution.{url: contentUrl, type: (encodingFormat || fileFormat), size: (contentSize || fileSize), profile: schemaVersion}])"
+        "object_content_identifier: (distribution[*].{url: (contentUrl || url), type: (encodingFormat || fileFormat), size: (contentSize || fileSize), profile: schemaVersion} || [distribution.{url: (contentUrl || url), type: (encodingFormat || fileFormat), size: (contentSize || fileSize), profile: schemaVersion}])"
         "language: inLanguage.name || inLanguage.alternateName || inLanguage}"
     )
     # 'related_resources: [{related_resource: isPartOf, relation_type: \'isPartOf\'}, {related_resource: isBasedOn, relation_type: \'isBasedOn\'}], ' \