Merge pull request #128 from pangaea-data-publisher/robbranch2

robbranch2

fuji_server/client/ex_evaluate.py

@@ -150,9 +150,9 @@
 #rdf
 #testpids=['https://databank.ora.ox.ac.uk/UniversityCollege/datasets/04156fde-dabb-48fd-baf6-533182f74b5b']
 #testpids=['https://data.gov.lv/dati/lv/dataset/maksatnespejas-procesi']
-testpids=['http://doi.org/10.17882/42182']*50
+testpids=['http://doi.org/10.17882/42182']
 #testpids = muchotestpids
-#testpids =['https://doi.pangaea.de/10.1594/PANGAEA.810463']*100
+testpids =['10.15152/QDB.121']
 startpid=''
 def effectivehandlers(logger):
     handlers = logger.handlers
@@ -193,7 +193,7 @@ def main():
     print('Total re3repositories found from datacite api : {}'.format(len(preproc.getRE3repositories())))
     print('Total subjects area of imported metadata standards : {}'.format(len(preproc.metadata_standards)))
     start=False
-    usedatacite = False
+    usedatacite = True
     tracemalloc.start()
     for identifier in testpids:
 

fuji_server/config/logging.ini

@@ -1,29 +0,0 @@
-[loggers]
-keys=root
-
-[logger_root]
-#handlers=file
-handlers=file,screen
-level=DEBUG
-
-[formatters]
-keys=simple
-
-[formatter_simple]
-format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
-datefmt=
-
-[handlers]
-keys=file,screen
-
-[handler_file]
-class=FileHandler
-formatter=simple
-level=DEBUG
-args=('%(logfilename)s', 'a', 'utf-8')
-
-[handler_screen]
-class=StreamHandler
-formatter=simple
-level=DEBUG
-args=(sys.stdout,)

fuji_server/controllers/fair_check.py

@@ -94,7 +94,7 @@ class FAIRCheck:
     FILES_LIMIT = None
     LOG_SUCCESS = 25
     VALID_RESOURCE_TYPES = []
-    FUJI_VERSION = 'v1.0.5b'
+    FUJI_VERSION = 'v1.0.5c'
 
     def __init__(self, uid, test_debug=False, oaipmh=None, use_datacite=True):
         uid_bytes = uid.encode('utf-8')

fuji_server/evaluators/fair_evaluator_data_access_level.py

@@ -52,7 +52,6 @@ def evaluate(self):
         #access_rights can be None or []
         if access_rights:
             self.logger.info('FsF-A1-01M : Found access rights information in dedicated metadata element')
-            access_rights = 'info:eu-repo/semantics/restrictedAccess'
             if isinstance(access_rights, str):
                 access_rights = [access_rights]
             for access_right in access_rights:

fuji_server/evaluators/fair_evaluator_minimal_metadata.py

@@ -51,7 +51,7 @@ def evaluate(self):
             test_status = 'pass'
         else:
             core_missing = list(set(metadata_required) - set(metadata_found))
-            self.logger.warning('FsF-F2-01M : Not all required core descriptive metadata elements exist{}'.format(str(core_missing)))
+            self.logger.warning('FsF-F2-01M : Not all required core descriptive metadata elements exist, missing: {}'.format(str(core_missing)))
             self.logger.info('FsF-F2-01M : Testing for required core citation metadata elements {}'.format(partial_elements))
             if set(partial_elements).issubset(metadata_found):
                 self.logger.log(self.fuji.LOG_SUCCESS,'FsF-F2-01M : Found required core citation metadata elements {}'.format(partial_elements))
@@ -62,7 +62,7 @@ def evaluate(self):
             else:
                 partial_missing = list(set(partial_elements) - set(metadata_found))
                 self.logger.warning(
-                    'FsF-F2-01M : Not all required citation metadata elements exist, missing :'+str(partial_missing))
+                    'FsF-F2-01M : Not all required citation metadata elements exist, missing: '+str(partial_missing))
                 metadata_status = 'insufficient metadata'  # status should follow enumeration in yaml
                 self.score.earned = 0
                 test_status = 'fail'