Setup and use our own UnparsedTextURIResolver

ndw · Aug 26, 2023 · a97ec1e · a97ec1e
1 parent 465c11e
commit a97ec1e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/src/main/java/com/xmlcalabash/core/XProcConfiguration.java b/src/main/java/com/xmlcalabash/core/XProcConfiguration.java
@@ -86,6 +86,7 @@ public class XProcConfiguration {
     public String stepName = null;
     public String entityResolver = "org.xmlresolver.Resolver";
     public String uriResolver = "org.xmlresolver.Resolver";
+    public String unparsedTextResolver = null;
     public String errorListener = null;
     public HashMap<QName,Class> implementations = new HashMap<QName,Class> ();
     public HashMap<String,String> serializationOptions = new HashMap<String,String>();

diff --git a/src/main/java/com/xmlcalabash/core/XProcRuntime.java b/src/main/java/com/xmlcalabash/core/XProcRuntime.java
@@ -63,6 +63,7 @@
 import net.sf.saxon.Configuration;
 import net.sf.saxon.lib.ExtensionFunctionDefinition;
 import net.sf.saxon.lib.FeatureKeys;
+import net.sf.saxon.lib.UnparsedTextURIResolver;
 import net.sf.saxon.om.AttributeMap;
 import net.sf.saxon.om.EmptyAttributeMap;
 import net.sf.saxon.om.NamespaceUri;
@@ -226,6 +227,7 @@ public XProcRuntime(XProcConfiguration config) {
         }
 
         saxonConfig.setResourceResolver(uriResolver);
+        saxonConfig.setUnparsedTextURIResolver(uriResolver);
         staticBaseURI = URIUtils.cwdAsURI();
 
         try {
@@ -235,6 +237,9 @@ public XProcRuntime(XProcConfiguration config) {
             if (config.entityResolver != null) {
                 uriResolver.setUnderlyingEntityResolver(Class.forName(config.entityResolver).asSubclass(EntityResolver.class).getDeclaredConstructor().newInstance());
             }
+            if (config.unparsedTextResolver != null) {
+                uriResolver.setUnderlyingUnparsedTextURIResolver(Class.forName(config.unparsedTextResolver).asSubclass(UnparsedTextURIResolver.class).getDeclaredConstructor().newInstance());
+            }
 
             if (config.errorListener != null) {
                 msgListener = Class.forName(config.errorListener).asSubclass(XProcMessageListener.class).getDeclaredConstructor().newInstance();

diff --git a/src/main/java/com/xmlcalabash/util/XProcURIResolver.java b/src/main/java/com/xmlcalabash/util/XProcURIResolver.java
@@ -20,6 +20,7 @@
 import org.xmlresolver.CatalogResolver;
 import org.xmlresolver.ResolvedResource;
 import org.xmlresolver.Resolver;
+import org.xmlresolver.sources.ResolverSAXSource;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParserFactory;
@@ -29,6 +30,7 @@
 import javax.xml.transform.sax.SAXSource;
 import javax.xml.transform.stream.StreamSource;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
@@ -398,8 +400,10 @@ public StreamSource[] resolve(String moduleURI, String baseURI, String[] locatio
 
     @Override
     public Reader resolve(URI uri, String encoding, Configuration configuration) throws XPathException {
-        if (unparsedTextResolver == null) {
-            // If there's no resolver, let Saxon do it...
+        // If there's no resolver, let's try to use the catalog resolver
+        if (catalogResolver != null) {
+            unparsedTextResolver = new CatalogUnparsedTextURIResolver(catalogResolver);
+        } else {
             unparsedTextResolver = new StandardUnparsedTextResolver();
         }
 
@@ -454,4 +458,33 @@ public Source resolve(ResourceRequest request) throws XPathException {
             }
         }
     }
+
+    private class CatalogUnparsedTextURIResolver implements UnparsedTextURIResolver {
+        private final Resolver resolver;
+
+        public CatalogUnparsedTextURIResolver(Resolver resolver) {
+            this.resolver = resolver;
+        }
+
+        @Override
+        public Reader resolve(URI uri, String encoding, Configuration configuration) throws XPathException {
+            InputStreamReader reader = null;
+
+            try {
+                Source source = resolver.resolveNamespace(uri.toString(), "https://www.iana.org/assignments/media-types/text/plain", null);
+
+                if (source instanceof ResolverSAXSource) {
+                    InputSource isource = ((ResolverSAXSource) source).getInputSource();
+                    reader = new InputStreamReader(isource.getByteStream());
+                } else if (source != null) {
+                    URL url = new URL(source.getSystemId());
+                    reader = new InputStreamReader(url.openStream());
+                }
+            } catch (IOException|TransformerException ex) {
+                reader = null;
+            }
+
+            return reader;
+        }
+    }
 }