Changeset 25848

Timestamp:

2012-06-28T11:14:55+12:00 (11 years ago)

Author:

sjm84

Message:

Some minor reformatting

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (2 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));
+        if (output.equals("skinandlibdocfinal"))
+        {
+            return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
         }
         return this.transformer.transform(skinAndLibraryDoc, doc, config_params, docWithDoctype);
@@ -871 +872 @@
             else
             {
-              //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));
+                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));
             }
         }