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

Timestamp:

2012-12-05T15:05:18+13:00 (11 years ago)

Author:

sjm84

Message:

Fixing the location of the collectionConfig file

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

@@ -701 +701 @@
             Document configStylesheet_doc = this.converter.getDOM(new File(configStylesheet_file));
 
-            if (_debug)
-            {
-                GSXSLT.modifyConfigFormatForDebug(configStylesheet_doc, GSFile.collectionConfigFile(GSFile.collectDir(GSFile.siteHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME)) + File.separator + collection)));
-            }
-
             if (configStylesheet_doc != null)
             {
                 Document format_doc = this.converter.newDOM();
                 format_doc.appendChild(format_doc.importNode(format_elem, true));
+
+                if (_debug)
+                {
+                    String siteHome = GSFile.siteHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME));
+                    GSXSLT.insertDebugElements(format_doc, GSFile.collectionConfigFile(siteHome, collection));
+                }
+
                 Node result = this.transformer.transform(configStylesheet_doc, format_doc, config_params); // Needs addressing <-
 
@@ -733 +735 @@
                 if (_debug)
                 {
-                    GSXSLT.mergeStylesheetsDebug(style_doc, new_format, true, true, "OTHER1", GSFile.collectionConfigFile(GSFile.collectDir(GSFile.siteHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME)) + File.separator + collection)));
+                    String siteHome = GSFile.siteHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME));
+                    GSXSLT.mergeStylesheetsDebug(style_doc, new_format, true, true, "OTHER1", GSFile.collectionConfigFile(siteHome, collection));
                 }
                 else