Changeset 33630

Show
Ignore:
Timestamp:
07.11.2019 14:44:16 (7 days ago)
Author:
kjdon
Message:

minor comment changes

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXSLT.java

    r32443 r33630  
    5151     *  
    5252     * elements are added in following order, and added to preserve original 
    53      * order with imported ones coming after existing ones import, include, 
    54      * output, variable, template 
     53     * order with imported ones coming after existing ones: 
     54     * import, include, output, variable, template 
    5555     */ 
    5656    public static void mergeStylesheetsDebug(Document main_xsl, Element extra_xsl, boolean overwrite, boolean debug, String firstDocFileName, String secondDocFileName) 
     
    194194                // there can't be any duplicate named templates, so just look for matches 
    195195                // we already have the one with highest import precedence (from the top most level) so don't add any more in 
    196                 if (GSXML.getElementsWithAttributesNS(main, GSXML.XSL_NAMESPACE, "template", new String[] { "name", "match", "mode" }, new String[] { template_name, template_match, template_mode }).getLength() == 0) 
    197                 { 
    198                     main.appendChild(main_xsl.importNode(node, true)); 
    199                 } 
    200             } 
     196              if (GSXML.getElementsWithAttributesNS(main, GSXML.XSL_NAMESPACE, "template", new String[] { "name", "match", "mode" }, new String[] { template_name, template_match, template_mode }).getLength() == 0) { 
     197                main.appendChild(main_xsl.importNode(node, true)); 
     198              } 
     199            } 
     200         
    201201        } 
    202202 
     
    345345        if (stylesheets.size() == 0) 
    346346        { 
    347             logger.error(" Can't find stylesheet for " + xslt_filename); 
     347            logger.error(" Can't find stylesheet " + xslt_filename); 
    348348            return null; 
    349349        } 
     
    358358        for (int i = stylesheets.size() - 2; i >= 0; i--) 
    359359        { 
     360           
    360361            Document currentDoc = converter.getDOM(stylesheets.get(i), "UTF-8"); 
    361362            if (currentDoc == null)