Changeset 26472 for main/trunk

Timestamp:

2012-11-19T23:21:46+13:00 (11 years ago)

Author:

davidb

Message:

For a group-by search results example, started to make use of xsl:key, however this was not looked for the the Greenstone mergeStylesheet pipeline, so extra block of code added for this.

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

@@ -153 +153 @@
         }
 
+        // key -- xsl:key elements need to be defined at the top level
+        children = GSXML.getChildrenByTagNameNS(extra_xsl, GSXML.XSL_NAMESPACE, "key");
+        for (int i = 0; i < children.getLength(); i++)
+        {
+            Element node = (Element) children.item(i);
+            // If the new xsl:key element is identical (in terms of name attr value) 
+            // to any in the merged document, don't copy it over
+            if (GSXML.getNamedElementNS(main, GSXML.XSL_NAMESPACE, "key", "name", node.getAttribute("name")) == null)
+            {
+                main.appendChild(main_xsl.importNode(node, true));
+            }
+        }
+
         // templates
         // append to end of document