Changeset 7739 for trunk/gli/src/org/greenstone/gatherer/Configuration.java

Timestamp:

2004-07-16T13:48:18+12:00 (20 years ago)

Author:

davidb

Message:

General restructuring to allow GLI to be run as an applet.
Main area of change: making code look in the JAR file first
for a file rather than assume on local file system.
Stores data locally on system in '.gli' or Greenstone/GLI
folder in users home space for subsequent uses of applet.

File:

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

trunk/gli/src/org/greenstone/gatherer/Configuration.java

@@ -67 +67 @@
     static final private String ARGUMENT_NAME = "name";
     /** The name of the general Gatherer configuration file. */
-    static final private String CONFIG_XML = "config.xml";
+    static public String CONFIG_XML = "config.xml";
     /** The name of the general Gatherer configuration file for running with GS3. */
-    static final private String GS3_CONFIG_XML = "config3.xml";
+    static public String GS3_CONFIG_XML = "config3.xml";
 
     static final private String CURRENT_CONFIGURATION_VERSION = "2.51u";
@@ -87 +87 @@
     static final private String OTHER_INFO = "Info";
     /** The name of the general Gatherer configuration template. */
-    static final private String TEMPLATE_CONFIG_XML = "xml/config.xml";
+    static public String TEMPLATE_CONFIG_XML = "xml/config.xml";
     /** The first of three patterns used during tokenization, this pattern handles a comma separated list. */
     static final private String TOKENIZER_PATTERN1 = " ,\n\t";
@@ -191 +191 @@
         Gatherer.println("exec_address != null -> " + exec_address);
     }
+
     ///ystem.err.println("Perl path.");
     this.perl_path = perl_path;
     // Ensure the perl path includes exe under windoze
-    if(Utility.isWindows() && !perl_path.toLowerCase().endsWith(".exe")) {
-        if(!perl_path.endsWith(File.separator)) {
-        perl_path = perl_path + File.separator;
-        }
-        perl_path = perl_path + "perl.exe";
+    if (!Gatherer.isGsdlRemote) {
+        if(Utility.isWindows() && !perl_path.toLowerCase().endsWith(".exe")) {
+        if(!perl_path.endsWith(File.separator)) {
+            perl_path = perl_path + File.separator;
+        }
+        perl_path = perl_path + "perl.exe";
+        }
     }
 
@@ -215 +218 @@
         config_xml = new File(config_xml_name);
         if(config_xml.exists()) {
-        general_config = Utility.parse(config_xml_name, false);
+        general_config = Utility.parse(config_xml_name, true);
         }
     }