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

Timestamp:

2012-10-31T10:45:59+13:00 (11 years ago)

Author:

sjm84

Message:

Some tidying

File:

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

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

@@ -45 +45 @@
 public class TransformingReceptionist extends Receptionist
 {
+    protected static final int CONFIG_PASS = 1;
+    protected static final int TEXT_PASS = 2;
 
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.core.TransformingReceptionist.class.getName());
@@ -923 +925 @@
 
         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) performTextFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request));
-        skinAndLibraryDoc = (Document) performConfigFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request));
+        skinAndLibraryDoc = (Document) performFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request), TEXT_PASS);
+        skinAndLibraryDoc = (Document) performFormatPass(collection, skinAndLibraryDoc, doc, new UserContext(request), CONFIG_PASS);
 
         if (_debug)
@@ -950 +952 @@
     }
 
-    protected Node performConfigFormatPass(String collection, Document skinAndLibraryDoc, Document doc, UserContext userContext)
-    {
-        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 (configStylesheet_doc != null)
-        {
-            return this.transformer.transform(configStylesheet_doc, skinAndLibraryDoc, config_params);
-        }
-        return skinAndLibraryDoc;
-    }
-
-    protected Node performTextFormatPass(String collection, Document skinAndLibraryDoc, Document doc, UserContext userContext)
-    {
-        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, "text_fragment_format.xsl");
+    protected Node performFormatPass(String collection, Document skinAndLibraryDoc, Document doc, UserContext userContext, int pass)
+    {
+        String formatFile;
+        if (pass == CONFIG_PASS)
+        {
+            formatFile = "config_format.xsl";
+        }
+        else
+        {
+            formatFile = "text_fragment_format.xsl";
+        }
+        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, formatFile);
         Document configStylesheet_doc = this.converter.getDOM(new File(configStylesheet_file));