Changeset 33630 for main/trunk
- Timestamp:
- 2019-11-07T14:44:16+13:00 (5 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXSLT.java
r32443 r33630 51 51 * 52 52 * 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, template53 * order with imported ones coming after existing ones: 54 * import, include, output, variable, template 55 55 */ 56 56 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 195 195 // 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 201 201 } 202 202 … … 345 345 if (stylesheets.size() == 0) 346 346 { 347 logger.error(" Can't find stylesheet for" + xslt_filename);347 logger.error(" Can't find stylesheet " + xslt_filename); 348 348 return null; 349 349 } … … 358 358 for (int i = stylesheets.size() - 2; i >= 0; i--) 359 359 { 360 360 361 Document currentDoc = converter.getDOM(stylesheets.get(i), "UTF-8"); 361 362 if (currentDoc == null)
Note:
See TracChangeset
for help on using the changeset viewer.