Changeset 36229 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

Timestamp:

2022-05-31T10:15:53+12:00 (2 years ago)

Author:

kjdon

Message:

I find it annoying when switching between gs2 and 3 that the gli config file (in .gli/config.xml) gets changed back and forth. In the same way we now have configRemote.xml for when we are running remotely, now locally, config.xml gets saved as config2.xml or config3.xml. they use the same config.xml template though. added final static strings for the filenames, and always use these, so only Configuration now contains the actual text strings. made Configuration.CONFIG_XML and Configuration.TEMPLATE_CONFIG_XML lowercase as they are not final Strings, they get changed by Gatherer.

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -186 +186 @@
         }
 
+                // Are we greenstone 2 or 3?
+                if (go.gsdl3_path != null && !go.gsdl3_path.equals("")) {
+                  this.GS3 = true;
+                  Configuration.config_xml = Configuration.CONFIG_XML_3;
+        } else {
+                  go.gsdl3_path = null;
+                  go.gsdl3_src_path = null;
+        }
+                
         // Are we using a remote Greenstone?
         if (go.use_remote_greenstone) {
@@ -217 +226 @@
         if (isGsdlRemote) {
             if (go.fedora_info.isActive()) {
-                Configuration.TEMPLATE_CONFIG_XML = "xml/" + Configuration.FEDORA_CONFIG_PREFIX + "configRemote.xml";
+                          Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX + Configuration.FEDORA_CONFIG_PREFIX + Configuration.CONFIG_REMOTE_XML; 
             }
             else {
-                Configuration.TEMPLATE_CONFIG_XML = "xml/configRemote.xml";
-            }
-
-            Configuration.CONFIG_XML = "configRemote.xml"; 
+                          Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX +  Configuration.CONFIG_REMOTE_XML; 
+            }
+
+            Configuration.config_xml = Configuration.CONFIG_REMOTE_XML; 
 
             File collect_directory = new File(Gatherer.getCollectDirectoryPath());
@@ -232 +241 @@
         else {      
             if (go.fedora_info.isActive()) {
-                Configuration.TEMPLATE_CONFIG_XML = "xml/" + Configuration.FEDORA_CONFIG_PREFIX + Configuration.CONFIG_XML;
+                Configuration.template_config_xml = Configuration.TEMPLATE_CONFIG_PREFIX + Configuration.FEDORA_CONFIG_PREFIX + Configuration.config_xml;
             }
             // else, the CONFIG_XML uses the default config file, which is for the local GS server
@@ -256 +265 @@
     String site_name, String servlet_path, String collect_directory_path) 
     {
-        if (gsdl3_path != null && !gsdl3_path.equals("")) {
-            this.GS3 = true;
-        } else {
-            gsdl3_path = null;
-            gsdl3_src_path = null;
-        }
+    
 
         // Create the debug stream if required