xalan_libxml_issue#283 (#299)

Reviewed-on: #299
Reviewed-by: Wojciech Szewczyk <szewczyw@noreply.example.com>

Backend-libXML/Parser.py

@@ -79,9 +79,11 @@ def xpath(source: str, xpath: str) -> str:
     else:
         result_string = ""
         for e in result:
-            result_string += etree.tostring(e, pretty_print=True).decode() + "\n"
+            if isinstance(e, etree._Element):
-        return result_string, "node"
+                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:

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

@@ -61,6 +61,13 @@ 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");
@@ -101,7 +108,10 @@ public class Xalan implements XmlEngine{
                     for (Node nn = n.getNextSibling(); isTextNode(nn); nn = nn.getNextSibling()) {
                         resultString.append(nn.getNodeValue());
                     }
-                } else {
+                } else if (isAttributeNode(n)) {
+                    resultString.append(n.getNodeValue());
+                }
+                else {
                     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
                     serializer.transform(new DOMSource(n), new StreamResult(new OutputStreamWriter(outputStream)));
                     resultString.append(outputStream);

Frontend/src/components/xml/XmlOutputFieldComponent.vue

@@ -18,6 +18,7 @@ const result = ref('');
 
 let enginesForCurrentTool = ref(["saxon", "xalan", "libxml"]);
 
+const allVersionsOfXpath = ["2.0", "3.0", "3.1"];
 const allVersions = ["1.0", "2.0", "3.0", "3.1"];
 let versionsForCurrentEngine = ref([""]);
 
@@ -73,7 +74,7 @@ function changeAvailableVersionsOfXPath() {
     if(engine.value == "xalan" || engine.value == "libxml")
         versionsForCurrentEngine.value = ["1.0"];
     else if (engine.value == "saxon")
-        versionsForCurrentEngine.value = allVersions;
+        versionsForCurrentEngine.value = allVersionsOfXpath;
 }
 
 function selectDefaultEngine() {