Changeset 35295

Timestamp:

2021-08-16T13:29:24+12:00 (3 years ago)

Author:

kjdon

Message:

if we want to add new namespaces into collection's xsl files, we need to make sure they are added into the main xsl, and then also into expand_gslib xsl, otherwise they will be ignored and left off the page

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• core/TransformingReceptionist.java (modified) (3 diffs)
• util/GSXML.java (modified) (2 diffs)
• util/GSXSLT.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -882 +882 @@
             return XMLTransformer.constructErrorXHTMLPage("Error loading file: "+ expand_gslib_filepath+"\n" + e.getMessage());
         }
-
+               
         // gslib.xsl
         Document gslib_xsl_doc = null;
@@ -914 +914 @@
   }
 
+  // if the page xsl or gslib xsl uses namespaces that are not listed in
+  // expand_gslib, then they will be ignored. So just check through and add
+  // any in that are missing.
+  GSXML.addMissingNamespaceAttributes(expand_gslib_xsl_doc.getDocumentElement(), page_xsl.getDocumentElement());
+  GSXML.addMissingNamespaceAttributes(expand_gslib_xsl_doc.getDocumentElement(), gslib_xsl_doc.getDocumentElement());
 
         Document pageAndGslibXsl = null;
@@ -944 +949 @@
           XMLTransformer preProcessor = new XMLTransformer();
           preProcessor.transform_withResultNode(expand_gslib_xsl_doc, pageAndGslibXsl, pageAndGslibDoc);
-
         }
         if (output.equals("xsl6")) {

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

@@ -35 +35 @@
 
 import org.apache.log4j.Logger;
+import org.w3c.dom.Attr;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -547 +548 @@
     return true;
   }
+
+  /** This adds any namespace attributes from donor_element into main_elem if they are not already there */
+  public static void addMissingNamespaceAttributes(Element main_elem, Element donor_elem) {
+    // are there any new namespaces to be added?
+    NamedNodeMap attributes = donor_elem.getAttributes();
+    for (int i=0; i<attributes.getLength(); i++) {
+      Attr att = (Attr)attributes.item(i);
+      String att_name = att.getName();
+      if (att_name.startsWith("xmlns:")) {
+        //logger.error("found a namespace att "+att_name);
+        if (main_elem.getAttribute(att_name).equals("")) {
+          main_elem.setAttribute(att_name, att.getValue());
+          //logger.error("setting att in main");
+        }
+      }
+    }
+    
+    
+  }
     public static Element createMetadataParamList(Document owner, Vector meta_values)
     {

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

@@ -62 +62 @@
 
         Element main = main_xsl.getDocumentElement();
+                // If extra_xsl has added namespaces, we need to make sure
+                // they are copied over into main
+                GSXML.addMissingNamespaceAttributes(main, extra_xsl);
+                
         Node insertion_point = null;
         Element last_import = GSXML.getLastElementByTagNameNS(main, GSXML.XSL_NAMESPACE, "import");