fixing default sparql query target; SPDX recognition by ID

pangaea-data-publisher · Jul 21, 2021 · d71eca9 · d71eca9
1 parent 4f5d8bf
commit d71eca9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/fuji_server/evaluators/fair_evaluator_license.py b/fuji_server/evaluators/fair_evaluator_license.py
@@ -49,11 +49,15 @@ def lookup_license_by_url(self, u, metric_id):
         self.logger.info('{0} : Verify URL through SPDX registry -: {1}'.format(metric_id, u))
         html_url = None
         isOsiApproved = False
+        ul = None
+        if 'spdx.org/licenses' in u:
+            ul = u.split('/')[-1]
         for item in self.fuji.SPDX_LICENSES:
             # u = u.lower()
             # if any(u in v.lower() for v in item.values()):
+            licenseId = item.get('licenseId')
             seeAlso = item.get('seeAlso')
-            if any(u in v for v in seeAlso):
+            if any(u in v for v in seeAlso) or licenseId == ul:
                 self.logger.info('{0} : Found SPDX license representation -: {1}'.format(metric_id, item['detailsUrl']))
                 # html_url = '.html'.join(item['detailsUrl'].rsplit('.json', 1))
                 html_url = item['detailsUrl'].replace(".json", ".html")

diff --git a/fuji_server/helper/metadata_collector_rdf.py b/fuji_server/helper/metadata_collector_rdf.py
@@ -130,7 +130,7 @@ def get_metadata(self,g, item, type='Dataset'):
         DCAT = Namespace("http://www.w3.org/ns/dcat#")
         meta = dict()
         #default sparql
-        met = self.get_default_metadata(item)
+        meta = self.get_default_metadata(g)
         meta['object_identifier'] = (g.value(item, DC.identifier) or g.value(item, DCTERMS.identifier))
         '''
         if self.source_name != self.getEnumSourceNames().RDFA.value: