Abstract Class EvaluatorBase

Author: ferag

api/evaluator.py

@@ -1347,11 +1347,12 @@ def rda_i3_01m(self, **kwargs):
         term_metadata = term_data["metadata"]
         id_list = []
         for index, row in term_metadata.iterrows():
-            logging.debug(self.item_id)
+            logger.debug(self.item_id)
 
             if row["text_value"].split("/")[-1] not in self.item_id:
                 id_list.append(row["text_value"])
         points, msg_list = self.eval_persistency(id_list)
+        return (points, msg_list)
 
     def rda_i3_01d(self):
         """Indicator RDA-A1-01M.

api/rda.py

@@ -36,24 +36,22 @@ def wrapper(body, **kwargs):
         # Get the identifiers through a search query
         ids = [item_id]
 
-        # FIXME oai-pmh should be no different
         downstream_logger = evaluator.logger
-        if repo not in ["oai-pmh"]:
+        try:
+            logger.debug("Trying to import plugin from plugins.%s.plugin" % (repo))
+            plugin = importlib.import_module("plugins.%s.plugin" % (repo), ".")
+            downstream_logger = plugin.logger
+        except Exception as e:
+            logger.error(str(e))
+            return str(e), 400
+        if pattern_to_query:
             try:
-                logger.debug("Trying to import plugin from plugins.%s.plugin" % (repo))
-                plugin = importlib.import_module("plugins.%s.plugin" % (repo), ".")
-                downstream_logger = plugin.logger
+                ids = plugin.Plugin.get_ids(
+                    oai_base=oai_base, pattern_to_query=pattern_to_query
+                )
             except Exception as e:
                 logger.error(str(e))
                 return str(e), 400
-            if pattern_to_query:
-                try:
-                    ids = plugin.Plugin.get_ids(
-                        oai_base=oai_base, pattern_to_query=pattern_to_query
-                    )
-                except Exception as e:
-                    logger.error(str(e))
-                    return str(e), 400
 
         # Set handler for evaluator logs
         evaluator_handler = ut.EvaluatorLogHandler()
@@ -66,11 +64,7 @@ def wrapper(body, **kwargs):
         result = {}
         exit_code = 200
         for item_id in ids:
-            # FIXME oai-pmh should be no different
-            if repo in ["oai-pmh"]:
-                eva = evaluator.Evaluator(item_id, oai_base, lang, config=config_data)
-            else:
-                eva = plugin.Plugin(item_id, oai_base, lang, config=config_data)
+            eva = plugin.Plugin(item_id, oai_base, lang, config=config_data)
             _result, _exit_code = wrapped_func(body, eva=eva)
             logger.debug(
                 "Raw result returned for indicator ID '%s': %s" % (item_id, _result)

api/utils.py

@@ -128,26 +128,6 @@ def test_status(points):
     return test_status
 
 
-def oai_identify(oai_base):
-    action = "?verb=Identify"
-    return oai_request(oai_base, action)
-
-
-def oai_metadataFormats(oai_base):
-    action = "?verb=ListMetadataFormats"
-    xmlTree = oai_request(oai_base, action)
-    metadataFormats = {}
-    for e in xmlTree.findall(".//{http://www.openarchives.org/OAI/2.0/}metadataFormat"):
-        metadataPrefix = e.find(
-            "{http://www.openarchives.org/OAI/2.0/}metadataPrefix"
-        ).text
-        namespace = e.find(
-            "{http://www.openarchives.org/OAI/2.0/}metadataNamespace"
-        ).text
-        metadataFormats[metadataPrefix] = namespace
-    return metadataFormats
-
-
 def is_persistent_id(item_id):
     """Returns boolean if the item id is or not a persistent identifier.
 
@@ -448,119 +428,6 @@ def check_metadata_terms_with_values(metadata, terms):
     return df_access
 
 
-def oai_check_record_url(oai_base, metadata_prefix, pid):
-    endpoint_root = urllib.parse.urlparse(oai_base).netloc
-    try:
-        pid_type = idutils.detect_identifier_schemes(pid)[0]
-    except Exception as e:
-        pid_type = "internal"
-        logging.error(e)
-    if pid_type != "internal":
-        oai_pid = idutils.normalize_pid(pid, pid_type)
-    else:
-        oai_pid = pid
-    action = "?verb=GetRecord"
-
-    test_id = "oai:%s:%s" % (endpoint_root, oai_pid)
-    params = "&metadataPrefix=%s&identifier=%s" % (metadata_prefix, test_id)
-    url_final = ""
-    url = oai_base + action + params
-    response = requests.get(url, verify=False, allow_redirects=True)
-    logging.debug("Trying ID v1: url: %s | status: %i" % (url, response.status_code))
-    error = 0
-    for tags in ET.fromstring(response.text).findall(
-        ".//{http://www.openarchives.org/OAI/2.0/}error"
-    ):
-        error = error + 1
-    if error == 0:
-        url_final = url
-
-    test_id = "%s" % (oai_pid)
-    params = "&metadataPrefix=%s&identifier=%s" % (metadata_prefix, test_id)
-
-    url = oai_base + action + params
-    logging.debug("Trying: " + url)
-    response = requests.get(url, verify=False)
-    error = 0
-    for tags in ET.fromstring(response.text).findall(
-        ".//{http://www.openarchives.org/OAI/2.0/}error"
-    ):
-        error = error + 1
-    if error == 0:
-        url_final = url
-
-    test_id = "%s:%s" % (pid_type, oai_pid)
-    params = "&metadataPrefix=%s&identifier=%s" % (metadata_prefix, test_id)
-
-    url = oai_base + action + params
-    logging.debug("Trying: " + url)
-    response = requests.get(url, verify=False)
-    error = 0
-    for tags in ET.fromstring(response.text).findall(
-        ".//{http://www.openarchives.org/OAI/2.0/}error"
-    ):
-        error = error + 1
-    if error == 0:
-        url_final = url
-
-    test_id = "oai:%s:%s" % (
-        endpoint_root,
-        oai_pid[oai_pid.rfind(".") + 1 : len(oai_pid)],
-    )
-    params = "&metadataPrefix=%s&identifier=%s" % (metadata_prefix, test_id)
-
-    url = oai_base + action + params
-    logging.debug("Trying: " + url)
-    response = requests.get(url, verify=False)
-    error = 0
-    for tags in ET.fromstring(response.text).findall(
-        ".//{http://www.openarchives.org/OAI/2.0/}error"
-    ):
-        error = error + 1
-    if error == 0:
-        url_final = url
-
-    test_id = "oai:%s:b2rec/%s" % (
-        endpoint_root,
-        oai_pid[oai_pid.rfind(".") + 1 : len(oai_pid)],
-    )
-    params = "&metadataPrefix=%s&identifier=%s" % (metadata_prefix, test_id)
-
-    url = oai_base + action + params
-    logging.debug("Trying: " + url)
-    response = requests.get(url, verify=False)
-    error = 0
-    for tags in ET.fromstring(response.text).findall(
-        ".//{http://www.openarchives.org/OAI/2.0/}error"
-    ):
-        error = error + 1
-    if error == 0:
-        url_final = url
-
-    return url_final
-
-
-def oai_get_metadata(url):
-    logging.debug("Metadata from: %s" % url)
-    oai = requests.get(url, verify=False, allow_redirects=True)
-    try:
-        xmlTree = ET.fromstring(oai.text)
-    except Exception as e:
-        logging.error("OAI_RQUEST: %s" % e)
-        xmlTree = None
-    return xmlTree
-
-
-def oai_request(oai_base, action):
-    oai = requests.get(oai_base + action, verify=False)  # Peticion al servidor
-    try:
-        xmlTree = ET.fromstring(oai.text)
-    except Exception as e:
-        logging.error("OAI_RQUEST: %s" % e)
-        xmlTree = ET.fromstring("<OAI-PMH></OAI-PMH>")
-    return xmlTree
-
-
 def find_dataset_file(metadata, url, data_formats):
     headers = {
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36"