Changeset 25389 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXSLT.java

Timestamp:

2012-04-16T21:04:39+12:00 (12 years ago)

Author:

ak19

Message:

Merging XSLT stylesheets should also process xsl:import statements in the same way it does xsl:include statements.

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXSLT.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXSLT.java

@@ -38 +38 @@
     {
         Element main = main_xsl.getDocumentElement();
+
         NodeList children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "include");
         for (int i = 0; i < children.getLength(); i++) {
@@ -45 +46 @@
             main.appendChild(main_xsl.importNode(node, true));
         }
+
+        children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "import");
+        for (int i = 0; i < children.getLength(); i++) {
+                Node node = children.item(i);
+            // remove any previous occurrences of xsl:output with the same method value
+            removeDuplicateElementsFrom(main, node, "xsl:import", "href");
+            main.appendChild(main_xsl.importNode(node, true));
+        }
+
         children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "output");
         for (int i = 0; i < children.getLength(); i++) {
@@ -53 +63 @@
         }
 
-        children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "template");        
-
+        children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "template");
         for (int i = 0; i < children.getLength(); i++)
         {