Merge pull request #193 from meaningfy-ws/feature/TED-552

Removed all xpaths property from XMLMetadata

Author: kaleanych

ted_sws/core/model/metadata.py

@@ -27,7 +27,6 @@ class XMLMetadata(Metadata):
         Stores the metadata of an XMLManifestation.
     """
     unique_xpaths: List[str] = None
-    xpaths: List[str] = None
 
 
 class LanguageTaggedString(NamedTuple):

ted_sws/data_sampler/services/notice_xml_indexer.py

@@ -11,7 +11,6 @@
 from ted_sws.resources import XSLT_FILES_PATH
 
 UNIQUE_XPATHS_XSLT_FILE_PATH = "get_unique_xpaths.xsl"
-XPATHS_XSLT_FILE_PATH = "get_xpaths.xsl"
 XSLT_PREFIX_RESULT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
 
 
@@ -29,7 +28,7 @@ def index_notice_by_id(notice_id: str, mongodb_client: MongoClient):
     notice_repository.update(notice=notice)
 
 
-def index_notice(notice: Notice, xslt_transformer=None, unique=True) -> Notice:
+def index_notice(notice: Notice, xslt_transformer=None) -> Notice:
     """
         This function selects unique XPath from XMlManifestation from a notice and indexes notices with these unique XPath.
     :param notice:
@@ -42,20 +41,16 @@ def index_notice(notice: Notice, xslt_transformer=None, unique=True) -> Notice:
         fp.write(notice.xml_manifestation.object_data.encode("utf-8"))
         xml_path = pathlib.Path(fp.name)
         xslt_path = XSLT_FILES_PATH
-        if unique:
-            xslt_path /= UNIQUE_XPATHS_XSLT_FILE_PATH
-        else:
-            xslt_path /= XPATHS_XSLT_FILE_PATH
+        xslt_path /= UNIQUE_XPATHS_XSLT_FILE_PATH
+
         if xslt_transformer is None:
             xslt_transformer = XMLPreprocessor()
         result = xslt_transformer.transform_with_xslt_to_string(xml_path=xml_path,
                                                                 xslt_path=xslt_path)
         xpaths = result[len(XSLT_PREFIX_RESULT):].split(",")
         xml_metadata = XMLMetadata()
-        if unique:
-            xml_metadata.unique_xpaths = xpaths
-        else:
-            xml_metadata.xpaths = xpaths
+        xml_metadata.unique_xpaths = xpaths
+
         notice.set_xml_metadata(xml_metadata=xml_metadata)
 
     return notice

ted_sws/notice_validator/adapters/xpath_coverage_runner.py

@@ -109,10 +109,10 @@ def coverage_notice_xpath(self, notices: List[Notice], mapping_suite_id) -> XPAT
             if self.mongodb_client is not None:
                 xpaths = get_unique_xpaths_covered_by_notices([notice.ted_id], self.mongodb_client)
             else:
-                notice = index_notice(notice, self.xslt_transformer, False)
+                notice = index_notice(notice, self.xslt_transformer)
 
-                if notice.xml_metadata and notice.xml_metadata.xpaths:
-                    xpaths = notice.xml_metadata.xpaths
+                if notice.xml_metadata and notice.xml_metadata.unique_xpaths:
+                    xpaths = notice.xml_metadata.unique_xpaths
 
             notice_xpaths[notice.ted_id] = self.based_xpaths(xpaths, self.base_xpath)
             xpaths_list += notice_xpaths[notice.ted_id]