Changeset 33647 for main/trunk

Timestamp:

2019-11-12T09:30:46+13:00 (4 years ago)

Author:

kjdon

Message:

added/changed a few of the output values for debugging the transform

File:

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

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

@@ -739 +739 @@
         Element format_elem = (Element) GSXML.getChildByTagName(page_response, GSXML.FORMAT_ELEM);
 
-        if (output.equals("format"))
+        if (output.equals("format1"))
         {
             return format_elem;
@@ -790 +790 @@
                 }
                 
-                if (output.equals("newformat"))
+                if (output.equals("format"))
                 {
                     return new_format;
@@ -820 +820 @@
         }
 
+        Document inline_template_doc = null;
         if (inline_template != null)
         {
             try
             {
-                Document inline_template_doc = this.converter.getDOM("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<xsl:stylesheet version=\"1.0\" "+GSXML.ALL_NAMESPACES_ATTS +  ">" + inline_template + "</xsl:stylesheet>", "UTF-8");
+              inline_template_doc = this.converter.getDOM("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<xsl:stylesheet version=\"1.0\" "+GSXML.ALL_NAMESPACES_ATTS +  ">" + inline_template + "</xsl:stylesheet>", "UTF-8");
 
                 if (_debug)
@@ -842 +843 @@
         }
 
+        
+        if (output.equals("ilt")) {
+          return converter.getDOM(getStringFromDocument(inline_template_doc));
+        }
         if (output.equals("xsl3")) {
           return converter.getDOM(getStringFromDocument(page_xsl));
@@ -906 +911 @@
     return converter.getDOM(getStringFromDocument(preprocessingXsl));
   }
-  if (output.equals("gslib")) {
+  if (output.equals("gslib1")) {
     return converter.getDOM(getStringFromDocument(libraryXsl));
   }
@@ -919 +924 @@
         // debug?? use debug method?? or does it not make sense here??
         GSXSLT.inlineImportAndIncludeFiles(libraryXsl, null, (String) this.config_params.get(GSConstants.SITE_NAME), collection, (String) this.config_params.get(GSConstants.INTERFACE_NAME), base_interfaces);
+  if (output.equals("gslib")) {
+    return converter.getDOM(getStringFromDocument(libraryXsl));
+  }
 
         // now, we transform all the gslib elements
@@ -956 +964 @@
         
 
-        if (output.equals("xsl6") || output.equals("skinandlibdocfinal"))
+        if (output.equals("xsl") || output.equals("skinandlibdocfinal"))
         {
           return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));