Merge pull request #15 from ndw/string-keys

Allow string keys in the extension function map

Author: ndw

gradle.properties

@@ -1,5 +1,5 @@
 basename=sinclude
 sincludeTitle=Saxon XInclude
-sincludeVersion=5.2.1
+sincludeVersion=5.2.2
 
 saxonVersion=11.5

src/main/java/com/nwalsh/xslt/XIncludeFunction.java

@@ -83,12 +83,7 @@ public Sequence call(XPathContext xpathContext, Sequence[] sequences) throws XPa
 
             boolean fixupBase = getBooleanOption(_fixup_xml_base, true);
             boolean fixupLang = getBooleanOption(_fixup_xml_lang, true);
-
-            boolean defaultTrimText = false;
-            boolean trimText = defaultTrimText;
-            if (getBooleanOption(_trim_text, false)) {
-                trimText = true;
-            }
+            boolean trimText = getBooleanOption(_trim_text, false);
 
             XdmNode doc = new XdmNode(source);
             XInclude xinclude = new XInclude();
@@ -129,7 +124,20 @@ private HashMap<QName,String> parseMap(MapItem item) throws XPathException {
             AtomicValue next = aiter.next();
             while (next != null) {
                 final QName key;
-                if (next.getItemType() == BuiltInAtomicType.QNAME) {
+                if (next.getItemType() == BuiltInAtomicType.STRING) {
+                    String keyname = next.getStringValue();
+                    if (keyname.contains(":")) {
+                        throw new IllegalArgumentException("Option map string keys must not contain a colon");
+                    }
+                    if (keyname.equals(_fixup_xml_base.getLocalName())
+                        || keyname.equals(_fixup_xml_lang.getLocalName())
+                        || keyname.equals(_trim_text.getLocalName())) {
+                        key = new QName("", keyname);
+                    } else {
+                        throw new IllegalArgumentException("Unrecognized option map string key: " + keyname);
+                    }
+
+                } else if (next.getItemType() == BuiltInAtomicType.QNAME) {
                     key = NamespaceUtils.qName((QNameValue) next);
                 } else {
                     throw new IllegalArgumentException("Option map keys must be QNames");

src/test/java/com/nwalsh/xslt/ExtFunctionTest.java

@@ -152,35 +152,4 @@ private XdmNode applyStylesheet(String stylesheet, String document) throws Saxon
             throw new RuntimeException("Value returned where node was expected");
         }
     }
-
-    public void foo() {
-        String stylesheet = "";
-        stylesheet += "<xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform'\n";
-        stylesheet += "                xmlns:ext='http://nwalsh.com/xslt'\n";
-        stylesheet += "                version='3.0'>\n\n";
-        stylesheet += "<xsl:output method='text' encoding='utf-8'/>\n\n";
-        stylesheet += "<xsl:template match='/' name='main'>\n";
-        stylesheet += "  <xsl:value-of select=\"'hello world'\"/>\n";
-        stylesheet += "</xsl:template>\n\n";
-        stylesheet += "</xsl:stylesheet>\n";
-
-        ByteArrayInputStream bais = new ByteArrayInputStream(
-                stylesheet.getBytes(StandardCharsets.UTF_8));
-
-        try {
-            RawDestination result = new RawDestination();
-            XsltCompiler compiler = processor.newXsltCompiler();
-            XsltExecutable exec = compiler.compile(new SAXSource(new InputSource(bais)));
-            XsltTransformer transformer = exec.load();
-            transformer.setDestination(result);
-            transformer.setInitialTemplate(new QName("", "main"));
-            transformer.transform();
-            XdmValue value = result.getXdmValue();
-            System.err.println(value);
-        } catch (SaxonApiException sae) {
-            sae.printStackTrace();
-            TestCase.fail();
-        }
-    }
-
 }