Changeset 8259

Timestamp:

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

Author:

mdewsnip

Message:

Moved some non-applet code out of Configuration and into Gatherer. This removes another Gatherer dependency.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

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

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

@@ -196 +196 @@
     }
 
-    ///ystem.err.println("Perl path.");
     this.perl_path = perl_path;
     // Ensure the perl path includes exe under windoze
-    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";
-        }
+    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";
     }
 

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

@@ -196 +196 @@
         // Load Config
         loadConfig(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
+
+        // 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());
+        }
+        }
 
         // the feedback dialog has been loaded with a default locale,