From 273163281ee3ffa15bf26b0aabee2ffb69b647b4 Mon Sep 17 00:00:00 2001 From: huberrob Date: Fri, 15 Sep 2023 13:48:33 +0200 Subject: [PATCH] wikidata back #403 --- fuji_server/data/linked_vocabs/fuji_ontologies.json | 6 ++++++ fuji_server/evaluators/fair_evaluator_license.py | 5 ++--- fuji_server/helper/linked_vocab_helper.py | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/fuji_server/data/linked_vocabs/fuji_ontologies.json b/fuji_server/data/linked_vocabs/fuji_ontologies.json index f6006b52..2f1efef9 100644 --- a/fuji_server/data/linked_vocabs/fuji_ontologies.json +++ b/fuji_server/data/linked_vocabs/fuji_ontologies.json @@ -55,5 +55,11 @@ "name": "META-SHARE ontology", "uri_format": "http://w3id.org/meta-share/meta-share/$1", "subjects" : ["humanities", "languages and literature"] + }, + "fuji.wikidata": { + "id": "fuji.wikidata", + "prefix": "wikidata", + "name": "Wikidata", + "uri_format": "https://www.wikidata.org/wiki/$1" } } \ No newline at end of file diff --git a/fuji_server/evaluators/fair_evaluator_license.py b/fuji_server/evaluators/fair_evaluator_license.py index 96a2bd62..e0136b7c 100644 --- a/fuji_server/evaluators/fair_evaluator_license.py +++ b/fuji_server/evaluators/fair_evaluator_license.py @@ -94,10 +94,9 @@ def isCreativeCommonsLicense(self,license_url, metric_id): iscc = False genericcc = None try: - - if 'creativecommons.org/publicdomain/mark/' in license_url: + if 'creativecommons.org/publicdomain/' in license_url: iscc = True - self.logger.info('{0} : Found CreativeCommons Public Domain Mark -: {1}'.format(metric_id, license_url)) + self.logger.info('{0} : Found CreativeCommons Public Domain Mark or License -: {1}'.format(metric_id, license_url)) genericcc = 'CC0-1.0' else: #https://wiki.creativecommons.org/wiki/License_Properties diff --git a/fuji_server/helper/linked_vocab_helper.py b/fuji_server/helper/linked_vocab_helper.py index 8663859a..06d2d8dd 100644 --- a/fuji_server/helper/linked_vocab_helper.py +++ b/fuji_server/helper/linked_vocab_helper.py @@ -14,7 +14,7 @@ def __init__(self, linked_vocab_index={}): self.linked_vocab_dict = {} self.ignore_prefixes = ['orcid','doi','isni','ror','wikipedia'] #prefixes used for identifiers only not terms - self.ignore_domain = ['orcid.org', 'doi.org','wikidata.org', 'ror.org','zenodo.org'] + self.ignore_domain = ['orcid.org', 'doi.org','ror.org','zenodo.org'] def set_linked_vocab_dict(self): print('Setting up the vocab dict.........................')