Merge remote-tracking branch 'origin/xpath_version_change' into xpath_version_change

Backend-libXML/Parser.py

@@ -79,13 +79,11 @@ def xpath(source: str, xpath: str) -> str:
     else:
         result_string = ""
         for e in result:
-            if isinstance(e, etree._Element):
             result_string += etree.tostring(e, pretty_print=True).decode() + "\n"
-            else:
-                result_string += str(e) + "\n"
         return result_string, "node"
 
 
+
 def xsd(source: str, xsd: str) -> bool:
     """
     Method used to validate XML string against XSD schema

Backend/tools-services/src/main/java/com/r11/tools/xml/Xalan.java

@@ -61,13 +61,6 @@ public class Xalan implements XmlEngine{
         return nodeType == Node.CDATA_SECTION_NODE || nodeType == Node.TEXT_NODE;
     }
 
-    private boolean isAttributeNode(Node n) {
-        if (n == null)
-            return false;
-        short nodeType = n.getNodeType();
-        return nodeType == Node.CDATA_SECTION_NODE || nodeType == Node.ATTRIBUTE_NODE;
-    }
-
     @Override
     public String processXSLT(XMLMultipleFilesData[] data, String transform) throws Exception {
         throw new UnsupportedOperationException("Xalan does not support multiple files XSLT processing");
@@ -108,10 +101,7 @@ public class Xalan implements XmlEngine{
                     for (Node nn = n.getNextSibling(); isTextNode(nn); nn = nn.getNextSibling()) {
                         resultString.append(nn.getNodeValue());
                     }
-                } else if (isAttributeNode(n)) {
+                } else {
-                    resultString.append(n.getNodeValue());
-                }
-                else {
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                     serializer.transform(new DOMSource(n), new StreamResult(new OutputStreamWriter(outputStream)));
                     resultString.append(outputStream);

Frontend/tsconfig.json

@@ -8,7 +8,8 @@
       "@components/*":["./src/components/*"],
       "@views/*":["./src/views/*"],
       "@assets/*":["./src/assets/*"],
-    }
+    },
+    "types": ["vite/client", "vue"]
   },
   "references": [
     {