Changeset 25821

Timestamp:

2012-06-26T15:38:11+12:00 (11 years ago)

Author:

kjdon

Message:

added o=skinandlibdocfinal to see the xslt after second config pass. Don't merge stylesheets after the second pass if not doing debug, just replace the doc contents

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

@@ -807 +807 @@
             GSXML.addDebugSpanTags(skinAndLibraryDoc);
         }
-
+        if (output.equals("skinandlibdocfinal")) {
+          return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
+        }
         return this.transformer.transform(skinAndLibraryDoc, doc, config_params, docWithDoctype);
 
@@ -863 +865 @@
             format_doc.appendChild(format_doc.importNode(skinAndLibraryDoc.getDocumentElement().cloneNode(true), true));
             Node result = this.transformer.transform(configStylesheet_doc, format_doc, config_params);
-
             if (_debug)
             {
@@ -870 +871 @@
             else
             {
-                GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true);
+              //GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true);
+              // we just want the result of the transform to be in skinAndLibraryDoc
+              Element old_doc = skinAndLibraryDoc.getDocumentElement();
+              skinAndLibraryDoc.removeChild(old_doc);
+              skinAndLibraryDoc.appendChild(skinAndLibraryDoc.importNode(((Document) result).getDocumentElement(), true));
             }
         }