3 Commits

Author SHA1 Message Date
3b96031a42 fix libxml xpath bugs 2025-02-06 18:30:30 +01:00
ec1b56677d remove unnecessary 2025-02-05 14:07:50 +01:00
1a72dc202d fix xalan xpath bugs 2025-02-05 12:46:00 +01:00
3 changed files with 23 additions and 6 deletions

View File

@@ -1,3 +1,5 @@
from typing import Any
from lxml import etree, html from lxml import etree, html
from io import BytesIO from io import BytesIO
@@ -79,9 +81,11 @@ def xpath(source: str, xpath: str) -> str:
else: else:
result_string = "" result_string = ""
for e in result: 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: def xsd(source: str, xsd: str) -> bool:

View File

@@ -18,6 +18,10 @@ import javax.xml.transform.stream.StreamSource;
import javax.xml.validation.Schema; import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory; import javax.xml.validation.SchemaFactory;
import javax.xml.validation.Validator; import javax.xml.validation.Validator;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpression;
import javax.xml.xpath.XPathFactory;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.StringReader; import java.io.StringReader;
@@ -61,6 +65,13 @@ public class Xalan implements XmlEngine{
return nodeType == Node.CDATA_SECTION_NODE || nodeType == Node.TEXT_NODE; 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 @Override
public String processXSLT(XMLMultipleFilesData[] data, String transform) throws Exception { public String processXSLT(XMLMultipleFilesData[] data, String transform) throws Exception {
throw new UnsupportedOperationException("Xalan does not support multiple files XSLT processing"); throw new UnsupportedOperationException("Xalan does not support multiple files XSLT processing");
@@ -101,7 +112,10 @@ public class Xalan implements XmlEngine{
for (Node nn = n.getNextSibling(); isTextNode(nn); nn = nn.getNextSibling()) { for (Node nn = n.getNextSibling(); isTextNode(nn); nn = nn.getNextSibling()) {
resultString.append(nn.getNodeValue()); resultString.append(nn.getNodeValue());
} }
} else { } else if (isAttributeNode(n)) {
resultString.append(n.getNodeValue());
}
else {
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
serializer.transform(new DOMSource(n), new StreamResult(new OutputStreamWriter(outputStream))); serializer.transform(new DOMSource(n), new StreamResult(new OutputStreamWriter(outputStream)));
resultString.append(outputStream); resultString.append(outputStream);

View File

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