Support the encoding attribute

Author: ndw

src/main/java/com/nwalsh/sinclude/DefaultDocumentResolver.java

@@ -45,11 +45,11 @@ public XdmNode resolveXml(XdmNode base, String uri, String accept, String accept
     }
 
     @Override
-    public XdmNode resolveText(XdmNode base, String uri, String accept, String acceptLanguage) {
+    public XdmNode resolveText(XdmNode base, String uri, String encoding, String accept, String acceptLanguage) {
         Processor processor = base.getProcessor();
         UnparsedTextURIResolver resolver = processor.getUnderlyingConfiguration().getUnparsedTextURIResolver();
         try {
-            Reader reader = resolver.resolve(base.getBaseURI().resolve(uri), "utf-8", processor.getUnderlyingConfiguration());
+            Reader reader = resolver.resolve(base.getBaseURI().resolve(uri), encoding, processor.getUnderlyingConfiguration());
             BufferedReader breader = new BufferedReader(reader);
             StringBuilder text = new StringBuilder();
             String line = breader.readLine();

src/main/java/com/nwalsh/sinclude/DocumentResolver.java

@@ -6,5 +6,5 @@
 
 public interface DocumentResolver {
     public XdmNode resolveXml(XdmNode base, String uri, String accept, String acceptLanguage);
-    public XdmNode resolveText(XdmNode base, String uri, String accept, String acceptLanguage);
+    public XdmNode resolveText(XdmNode base, String uri, String encoding, String accept, String acceptLanguage);
 }

src/main/java/com/nwalsh/sinclude/XInclude.java

@@ -213,6 +213,7 @@ public XdmNode process(XdmNode node) throws XPathException {
             String xptr = node.getAttributeValue(_xpointer);
             String fragid = node.getAttributeValue(_fragid);
             String setId = node.getAttributeValue(_set_xml_id);
+            String encoding = node.getAttributeValue(_encoding);
             String accept = node.getAttributeValue(_accept);
             String accept_lang = node.getAttributeValue(_accept_language);
             String parseAttr = node.getAttributeValue(_parse);
@@ -222,6 +223,10 @@ public XdmNode process(XdmNode node) throws XPathException {
                 href = "";
             }
 
+            if (encoding == null) {
+                encoding = "UTF-8";
+            }
+
             if (accept != null && accept.matches(".*[^\u0020-\u007e].*")) {
                 throw new IllegalArgumentException("Invalid characters in accept value");
             }
@@ -324,7 +329,7 @@ public XdmNode process(XdmNode node) throws XPathException {
                     uriStack.push(next);
 
                     if (parse == ParseType.TEXTPARSE) {
-                        doc = resolver.resolveText(node, href, accept, accept_lang);
+                        doc = resolver.resolveText(node, href, encoding, accept, accept_lang);
                     } else {
                         doc = resolver.resolveXml(node, href, accept, accept_lang);
                     }

src/test/java/com/nwalsh/sinclude/FakeDocumentResolver.java

@@ -299,7 +299,7 @@ public XdmNode resolveXml(XdmNode base, String uri, String accept, String accept
     }
 
     @Override
-    public XdmNode resolveText(XdmNode base, String uri, String accept, String acceptLanguage) {
+    public XdmNode resolveText(XdmNode base, String uri, String encoding, String accept, String acceptLanguage) {
         Logger logger = base.getProcessor().getUnderlyingConfiguration().getLogger();
         logger.info("Resolving text XInclude: " + uri + " (" + base.getBaseURI().resolve(uri).toASCIIString() + ")");
         if (textMap.containsKey(uri)) {

src/test/java/com/nwalsh/sinclude/XIncludeTest.java

@@ -13,6 +13,7 @@
 
 import javax.xml.transform.sax.SAXSource;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.nio.charset.StandardCharsets;
 
 public class XIncludeTest extends TestCase {
@@ -325,4 +326,17 @@ public void testTextGhLineRange() {
         compareDocs("ghlinerange.xml");
     }
 
+    public void testEncoding() {
+        XInclude include = new XInclude();
+
+        try {
+            DocumentBuilder builder = processor.newDocumentBuilder();
+            XdmNode doc = builder.build(new File("src/test/resources/iso-8859-1.xml"));
+            XdmNode resolved = include.expandXIncludes(doc);
+            assertNotNull(resolved);
+        } catch (Exception e) {
+            fail();
+        }
+    }
+
 }

src/test/resources/iso-8859-1.txt

@@ -0,0 +1 @@
+This is a simple text file in ISO-8859-1: � � �

src/test/resources/iso-8859-1.xml

@@ -0,0 +1,6 @@
+<document>
+  <xi:include href="iso-8859-1.txt"
+              parse="text"
+              encoding="iso-8859-1"
+              xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</document>