Changeset 25644

Timestamp:

2012-05-23T16:40:22+12:00 (12 years ago)

Author:

sjm84

Message:

Adding in some unfinished code that will help us view the XML a page was generated with

File:

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

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

@@ -61 +61 @@
     protected TransformerFactory transformerFactory = null;
     protected DOMParser parser = null;
+
+    boolean _debug = false;
 
     public TransformingReceptionist()
@@ -436 +438 @@
             Text intnametext = theXML.createTextNode((String) config_params.get(GSConstants.INTERFACE_NAME));
             intname.appendChild(intnametext);
-            
+
             Element siteName = theXML.createElement("param");
             siteName.setAttribute("name", "site_name");
@@ -501 +503 @@
             String configStylesheet_file = GSFile.stylesheetFile(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces, "config_format.xsl");
             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)
@@ -527 +534 @@
 
                 // add extracted GSF statements in to the main stylesheet
-                GSXSLT.mergeStylesheets(style_doc, new_format);
+                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)));
+                }
+                else
+                {
+                    GSXSLT.mergeStylesheets(style_doc, new_format, true);
+                }
                 //System.out.println("added extracted GSF statements into the main stylesheet") ;
 
@@ -536 +550 @@
             {
                 logger.error(" couldn't parse the config_format stylesheet, adding the format info as is");
-                GSXSLT.mergeStylesheets(style_doc, format_elem);
+                GSXSLT.mergeStylesheets(style_doc, format_elem, true);
                 //GSXSLT.mergeStylesheets(oldStyle_doc, format_elem);
             }
@@ -594 +608 @@
         Document skinAndLibraryXsl = null;
         Document skinAndLibraryDoc = converter.newDOM();
-        
+
         // Applying the preprocessing XSLT - in its own block {} to allow use of non-unique variable names
         {
@@ -626 +640 @@
             //System.out.println("GS-Lib statements are now expanded") ;
         }
-    
 
         //The following code is to be uncommented if we need to append the extracted GSF statements
@@ -763 +776 @@
             try
             {
-                Document inlineTemplateDoc = this.converter.getDOM("<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" xmlns:java=\"http://xml.apache.org/xslt/java\" xmlns:util=\"xalan://org.greenstone.gsdl3.util.XSLTUtil\" xmlns:gsf=\"http://www.greenstone.org/greenstone3/schema/ConfigFormat\">" + inlineTemplate + "</xsl:stylesheet>");
-                GSXSLT.mergeStylesheets(skinAndLibraryDoc, inlineTemplateDoc.getDocumentElement());
+                Document inlineTemplateDoc = this.converter.getDOM("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<xsl:stylesheet version=\"1.0\" xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" xmlns:java=\"http://xml.apache.org/xslt/java\" xmlns:util=\"xalan://org.greenstone.gsdl3.util.XSLTUtil\" xmlns:gsf=\"http://www.greenstone.org/greenstone3/schema/ConfigFormat\">" + inlineTemplate + "</xsl:stylesheet>", "UTF-8");
+
+                if (_debug)
+                {
+                    GSXSLT.mergeStylesheetsDebug(skinAndLibraryDoc, inlineTemplateDoc.getDocumentElement(), true, true, "OTHER2", "INLINE");
+                }
+                else
+                {
+                    GSXSLT.mergeStylesheets(skinAndLibraryDoc, inlineTemplateDoc.getDocumentElement(), true);
+                }
             }
             catch (Exception ex)
@@ -780 +801 @@
         {
             return doc;
+        }
+
+        if(_debug)
+        {
+            GSXML.addDebugSpanTags(skinAndLibraryDoc);
         }
 
@@ -834 +860 @@
         if (configStylesheet_doc != null)
         {
-            Document format_doc = this.converter.newDOM();
+            Document format_doc = XMLConverter.newDOM();
             format_doc.appendChild(format_doc.importNode(skinAndLibraryDoc.getDocumentElement().cloneNode(true), true));
             Node result = this.transformer.transform(configStylesheet_doc, format_doc, config_params);
-            GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement());
+
+            if (_debug)
+            {
+                GSXSLT.mergeStylesheetsDebug(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true, true, "OTHER3", GSFile.collectionConfigFile(GSFile.collectDir(GSFile.siteHome(GlobalProperties.getGSDL3Home(), (String) this.config_params.get(GSConstants.SITE_NAME)) + File.separator + collection)));
+            }
+            else
+            {
+                GSXSLT.mergeStylesheets(skinAndLibraryDoc, ((Document) result).getDocumentElement(), true);
+            }
         }
     }
@@ -915 +949 @@
             }
 
-            GSXSLT.mergeStylesheets(finalDoc, currentDoc.getDocumentElement());
+            if (_debug)
+            {
+                GSXSLT.mergeStylesheetsDebug(finalDoc, currentDoc.getDocumentElement(), true, true, stylesheets.get(stylesheets.size() - 1).getAbsolutePath(), stylesheets.get(i).getAbsolutePath());
+            }
+            else
+            {
+                GSXSLT.mergeStylesheets(finalDoc, currentDoc.getDocumentElement(), true);
+            }
+        }
+
+        if (_debug)
+        {
+            GSXSLT.inlineImportAndIncludeFiles(finalDoc, null, 0);
         }