Changeset 33630

Timestamp:

2019-11-07T14:44:16+13:00 (4 years ago)

Author:

kjdon

Message:

minor comment changes

File:

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

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

@@ -51 +51 @@
      * 
      * elements are added in following order, and added to preserve original
-     * order with imported ones coming after existing ones import, include,
-     * output, variable, template
+     * order with imported ones coming after existing ones:
+     * import, include, output, variable, template
      */
     public static void mergeStylesheetsDebug(Document main_xsl, Element extra_xsl, boolean overwrite, boolean debug, String firstDocFileName, String secondDocFileName)
@@ -194 +194 @@
                 // there can't be any duplicate named templates, so just look for matches
                 // we already have the one with highest import precedence (from the top most level) so don't add any more in
-                if (GSXML.getElementsWithAttributesNS(main, GSXML.XSL_NAMESPACE, "template", new String[] { "name", "match", "mode" }, new String[] { template_name, template_match, template_mode }).getLength() == 0)
-                {
-                    main.appendChild(main_xsl.importNode(node, true));
-                }
-            }
+              if (GSXML.getElementsWithAttributesNS(main, GSXML.XSL_NAMESPACE, "template", new String[] { "name", "match", "mode" }, new String[] { template_name, template_match, template_mode }).getLength() == 0) {
+                main.appendChild(main_xsl.importNode(node, true));
+              }
+            }
+        
         }
 
@@ -345 +345 @@
         if (stylesheets.size() == 0)
         {
-            logger.error(" Can't find stylesheet for " + xslt_filename);
+            logger.error(" Can't find stylesheet " + xslt_filename);
             return null;
         }
@@ -358 +358 @@
         for (int i = stylesheets.size() - 2; i >= 0; i--)
         {
+          
             Document currentDoc = converter.getDOM(stylesheets.get(i), "UTF-8");
             if (currentDoc == null)