removed unnessecary prints; fixed type conversion bug in data_contet_…

…metadata
pangaea-data-publisher · Jul 16, 2021 · 0c96ccd · 0c96ccd
1 parent c39f7e3
commit 0c96ccd
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/fuji_server/controllers/fair_check.py b/fuji_server/controllers/fair_check.py
@@ -224,7 +224,6 @@ def uri_validator(u):  # TODO integrate into request_helper.py
     def set_remote_logging_target(self, host, path):
         if host and path:
             try:
-                print(host,path, self.test_id)
                 weblogger = logging.handlers.HTTPHandler(host,
                                                          path + '?testid=' + str(self.test_id), method='POST')
                 webformatter = logging.Formatter('%(levelname)s - %(message)s \r\n')
@@ -313,7 +312,7 @@ def retrieve_apis_standards(self):
             else:
                 self.logger.info('FsF-R1.3-01M : Trying to retrieve metadata info from re3data/datacite services using client id -: '+str(client_id))
                 #find endpoint via datacite/re3data if pid is provided
-                print(client_id ,self.pid_scheme)
+                #print(client_id ,self.pid_scheme)
                 if client_id and self.pid_scheme:
                     repoHelper = RepositoryHelper(client_id, self.pid_scheme, logger= self.logger.name)
                     repoHelper.lookup_re3data()

diff --git a/fuji_server/controllers/fair_object_controller.py b/fuji_server/controllers/fair_object_controller.py
@@ -58,7 +58,7 @@ def assess_by_id(body):  # noqa: E501
         ft = FAIRCheck(uid=identifier, test_debug=debug, metadata_service_url = metadata_service_endpoint, metadata_service_type =metadata_service_type, use_datacite=usedatacite, oaipmh_endpoint =oaipmh_endpoint)
         # set target for remote logging
         remote_log_host, remote_log_path = Preprocessor.remote_log_host, Preprocessor.remote_log_path
-        print(remote_log_host, remote_log_path)
+        #print(remote_log_host, remote_log_path)
         if remote_log_host and remote_log_path:
             ft.set_remote_logging_target(remote_log_host, remote_log_path)
         uid_result, pid_result = ft.check_unique_persistent()

diff --git a/fuji_server/evaluators/fair_evaluator_data_content_metadata.py b/fuji_server/evaluators/fair_evaluator_data_content_metadata.py
@@ -185,11 +185,23 @@ def evaluate(self):
                     elif d == 'size':
                         if tika_content_size == 0:
                             self.logger.warning('{0} : Could not verify content size (received: 0 bytes) from downloaded file'.format(self.metric_identifier))
-                        elif int(data_object.get('size')) == int(tika_content_size):
-                            matches_content = True
-                            matches_size = True
                         else:
-                            self.logger.warning('{0} : Could not verify content size from downloaded file -: (expected: {1}, found: {2})'.format(self.metric_identifier, str(data_object.get('size')), str(tika_content_size) ))
+                            #print(type(data_object.get('size')))
+                            try:
+                                object_size=int(float(data_object.get('size')))
+                                if object_size == tika_content_size:
+                                    matches_content = True
+                                    matches_size = True
+                                else:
+                                    self.logger.warning(
+                                        '{0} : Could not verify content size from downloaded file -: (expected: {1}, found: {2})'.format(
+                                            self.metric_identifier, str(data_object.get('size')),
+                                            str(tika_content_size)))
+
+                            except Exception as e:
+                                self.logger.warning(
+                                    '{0} : Could not verify content size from downloaded file -: (expected: {1}, found: {2})'.format(
+                                        self.metric_identifier, str(data_object.get('size')), str(tika_content_size)))
 
                     data_content_filetype_inner = DataContentMetadataOutputInner()
                     data_content_filetype_inner.descriptor = descriptor

diff --git a/fuji_server/helper/metadata_collector_rdf.py b/fuji_server/helper/metadata_collector_rdf.py
@@ -111,7 +111,6 @@ def get_default_metadata(self,g):
                             else:
                                 meta[l] = str(v)
                     break
-                print(meta['related_resources'])
             else:
                 self.logger.info('FsF-F2-01M : Graph seems to contain only one triple, skipping core metadata element test')
         except Exception as e:
@@ -130,7 +129,6 @@ def get_metadata(self,g, item, type='Dataset'):
         meta = dict()
         #default sparql
         met = self.get_default_metadata(item)
-        print(met)
         meta['object_identifier'] = (g.value(item, DC.identifier) or g.value(item, DCTERMS.identifier))
         '''
         if self.source_name != self.getEnumSourceNames().RDFA.value:
@@ -160,7 +158,6 @@ def get_metadata(self,g, item, type='Dataset'):
         for v in [meta['title'],meta['summary'], meta['publisher']]:
             if v:
                 v = v.toPython()
-        print(meta)
         return meta
 
     def get_ontology_metadata(self, graph):