Changeset 8261

Timestamp:

2004-10-08T16:44:07+13:00 (20 years ago)

Author:

mdewsnip

Message:

Moved another Gatherer dependency out of the Configuration class.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (2 diffs)
• Gatherer.java (modified) (1 diff)

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

@@ -115 +115 @@
     static public String site_name = "";
     /** The servlet path if we are using GS3 */
-    static private String servlet_path = "";
+    static public String servlet_path = "";
     /** If true, overrides the mirroring enabled setting in the config.xml file. */
     static private boolean mirroring_enabled = false;
@@ -590 +590 @@
 
     static public String getServletPath() {
-    if (servlet_path == null) {
-        servlet_path = Gatherer.servlet_config.getServletPath(site_name);
-    }
     return servlet_path;
     }
+
     /** Retrieve the value of the named property, and noting whether we consult the general or collection specific configuration. */
     static public String getString(String property, boolean general) {

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

@@ -198 +198 @@
 
         // I don't really know what this is for but I've moved it here from Configuration
-        if (isGsdlRemote && Utility.isWindows() && perl_path != null) {
-        if (perl_path.toLowerCase().endsWith("perl.exe")) {
-            perl_path = perl_path.substring(0, perl_path.length() - "perl.exe".length());
-        }
-        if (perl_path.endsWith(File.separator)) {
-            perl_path = perl_path.substring(0, perl_path.length() - File.separator.length());
-        }
+        if (isGsdlRemote && Utility.isWindows() && Configuration.perl_path != null) {
+        if (Configuration.perl_path.toLowerCase().endsWith("perl.exe")) {
+            Configuration.perl_path = Configuration.perl_path.substring(0, Configuration.perl_path.length() - "perl.exe".length());
+        }
+        if (Configuration.perl_path.endsWith(File.separator)) {
+            Configuration.perl_path = Configuration.perl_path.substring(0, Configuration.perl_path.length() - File.separator.length());
+        }
+        }
+
+        if (GS3 && Configuration.servlet_path == null) {
+        Configuration.servlet_path = servlet_config.getServletPath(Configuration.site_name);
         }