Changeset 26458 for main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

Timestamp:

2012-11-14T15:37:35+13:00 (11 years ago)

Author:

sjm84

Message:

Phase one of commiting the improved debugging system

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/TransformingReceptionist.java

@@ -924 +924 @@
         }
 
-        GSXSLT.inlineImportAndIncludeFiles(skinAndLibraryDoc, null, (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
+        if (_debug)
+        {
+            GSXSLT.inlineImportAndIncludeFilesDebug(skinAndLibraryDoc, null, _debug, this.getGSLibXSLFilename(), (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
+        }
+        else
+        {
+            GSXSLT.inlineImportAndIncludeFiles(skinAndLibraryDoc, null, (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
+        }
         skinAndLibraryDoc = (Document) performFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request), TEXT_PASS);
         skinAndLibraryDoc = (Document) performFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request), CONFIG_PASS);
 
+        if (output.equals("xmlfinal"))
+        {
+            return doc;
+        }
+
+        if (output.equals("skinandlibdocfinal"))
+        {
+            return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
+        }
+
+        Node finalResult = this.transformer.transform(skinAndLibraryDoc, doc, config_params, docWithDoctype);
+
         if (_debug)
         {
-            GSXML.addDebugSpanTags(skinAndLibraryDoc);
-        }
-
-        if (output.equals("xmlfinal"))
-        {
-            return doc;
-        }
-
-        if (output.equals("skinandlibdocfinal"))
-        {
-            return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));
-        }
-
-        return this.transformer.transform(skinAndLibraryDoc, doc, config_params, docWithDoctype);
+            GSXSLT.fixTables((Document) finalResult);
+        }
+
+        return finalResult;
 
         // The line below will do the transformation like we use to do before having Skin++ implemented,