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

Timestamp:

2019-11-11T10:48:41+13:00 (4 years ago)

Author:

kjdon

Message:

oops, I must have 'tidied' up the file and then not compiled it to check as it didn't compile. erroneous and missing brackets

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

@@ -940 +940 @@
           root.appendChild(l);
 
+          // actually merge the gslib file with the page
           XMLTransformer preProcessor = new XMLTransformer();
           preProcessor.transform_withResultNode(preprocessingXsl, skinAndLibraryXsl, skinAndLibraryDoc);
@@ -948 +949 @@
         }
 
+        // now we need to transform all the gsf elements
         skinAndLibraryDoc = (Document) transformGSFElements(collection, skinAndLibraryDoc, TEXT_FORMAT_FILE); 
           
         skinAndLibraryDoc = (Document) transformGSFElements(collection, skinAndLibraryDoc, CONFIG_FORMAT_FILE); 
-        }
-        
-
-        if (output.equals("xsl6") || output.equals("skinandlibdocfinal")
+    
+        
+
+        if (output.equals("xsl6") || output.equals("skinandlibdocfinal"))
         {
           return converter.getDOM(getStringFromDocument(skinAndLibraryDoc));