Changeset 35295 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core

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

File:

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

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")) {