Changeset 4704

Timestamp:

2003-06-18T11:58:26+12:00 (21 years ago)

Author:

kjdon

Message:

no longer use ConfigVars, so pass in variables individually. also named templates now overwrite teh old ones when added format stuff to a stylesheet - you cant have two tempalates with teh same name

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXSLT.java (modified) (4 diffs)

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

@@ -14 +14 @@
 
     /** takes a stylesheet Document, and adds in any child nodes from extra_xsl
+     * named templates overwrite any existing one, while match templates are
+just added to the end of teh stylesheet
      */
     public static void mergeStylesheets(Document main_xsl, Element extra_xsl) {
@@ -19 +21 @@
     Element main = main_xsl.getDocumentElement();
     
-    NodeList children = extra_xsl.getChildNodes();
+    NodeList children = extra_xsl.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "template");
     for (int i=0; i<children.getLength(); i++) {
-         main.appendChild(main_xsl.importNode(children.item(i), true));
+        String name = ((Element)children.item(i)).getAttribute("name");
+        if (!name.equals("")) {
+        Element old_template = GSXML.getNamedElement(main, "xsl:template", "name", name);
+        if (old_template != null) {
+            main.removeChild(old_template);
+        }
+        }
+        
+        main.appendChild(main_xsl.importNode(children.item(i), true));
     }
 
@@ -30 +40 @@
      */
     public static void absoluteIncludePaths(Document stylesheet, 
-                     ConfigVars config) {
+                        String gsdl3_home,
+                        String site_name,
+                        String interface_name) {
     
     
@@ -38 +50 @@
         String name = child.getNodeName();
         if (name.equals("xsl:import") || name.equals("xsl:include")) {
-        ((Element)child).setAttribute("href", GSFile.stylesheetFile(config, ((Element)child).getAttribute("href")));
+        ((Element)child).setAttribute("href", GSFile.stylesheetFile(gsdl3_home, site_name, interface_name, ((Element)child).getAttribute("href")));
         }
         child = child.getNextSibling();