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

Timestamp:

2012-04-13T18:51:06+12:00 (12 years ago)

Author:

ak19

Message:

Getting the gs2-library servlet (gs2 interface) work again: 1. the changes to GSXSLT.java ensure that when merging inherited stylesheets, not only duplicated template names and but also duplicated template matches as well as include hrefs and output methods are reduced to only one instance, which are solely those occurring in the stylesheet that is most relevant. As stylesheets are passed in from TransformingReceptionist in the necessary order, this was easily done. 2. To get the main page to work again, the gs2 interface's home.xsl file needed to match a template on page/pageResponse not just pageResponse so that duplicate template matches can be picked up in GSXSLT.java. 3. The gs2 interface's classifier.xsl needs to define a template match for classifierList which has now been copied from the equivalent file in the default interface. This allows the Browse pages of the gs2-library servlet to work again. 4. The namespaces used in default interface's util.xsl has been made consistent with equivalent definitions in other Greenstone xsl files. This did not fix any errors, but it's less confusing now.

File:

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

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", "template");
+        NodeList children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "include");
+        for (int i = 0; i < children.getLength(); i++) {
+                Node node = children.item(i);
+            // remove any previous occurrences of xsl:include with the same href value
+            removeDuplicateElementsFrom(main, node, "xsl:include", "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++) {
+                Node node = children.item(i);
+            // remove any previous occurrences of xsl:output with the same method value
+            removeDuplicateElementsFrom(main, node, "xsl:output", "method");            
+            main.appendChild(main_xsl.importNode(node, true));
+        }
+
+        children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "template");        
+
         for (int i = 0; i < children.getLength(); i++)
         {
             Node node = children.item(i);
-            String name = ((Element) node).getAttribute("name");
-            if (!name.equals(""))
-            {
-                Element old_template = GSXML.getNamedElement(main, "xsl:template", "name", name);
-                if (old_template != null)
-                {
-                    main.removeChild(old_template);
-                }
-            }
-
+            // remove any previous occurrences of xsl:template with the same value for name
+            // or even the same value for match (should we use priorities for match?)
+            removeDuplicateElementsFrom(main, node, "xsl:template", "name");
+            removeDuplicateElementsFrom(main, node, "xsl:template", "match");
             main.appendChild(main_xsl.importNode(node, true));
         }
     }
+
+    // In element main, tries to find if any previous occurrence of elements with template=templateName, 
+    // and whose named attribute (attributeName) has the same value as the same attribute in node.
+    // If this is the case, such a previous occurrence is removed it from element main
+    public static void removeDuplicateElementsFrom(Element main, Node node, String templateName, String attrName) {
+    String attr = ((Element) node).getAttribute(attrName);
+    if (!attr.equals(""))
+        {
+        Element old_template = GSXML.getNamedElement(main, templateName, attrName, attr);
+        if (old_template != null)
+            {
+            main.removeChild(old_template);
+            }
+        }
+    }
+
+
 
     /**