Changeset 7679

Timestamp:

2004-06-30T16:26:05+12:00 (20 years ago)

Author:

kjdon

Message:

wget may be specified by the user in gli.sh, but otherwise we use teh greenstone version. theres a space for version testing but it doesn't do anything yet.

File:

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

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

@@ -207 +207 @@
     try {
         // Load Config
-        loadConfig(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, wget_version_str, wget_path, site_name);
+        loadConfig(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
 
         // the feedback dialog has been loaded with a default locale, 
@@ -264 +264 @@
         boolean mirror_workflow = config.get(StaticStrings.WORKFLOW_MIRROR, false);
         if (mirror_workflow) {
-        // we only bother to check if mirroring is turned on
-        String wget_version =  config.getWGetVersion();
-        if (wget_version.equals(StaticStrings.NO_WGET_STR)) {
-            missingWGET();
-        } else if (wget_version.equals(StaticStrings.WGET_OLD_STR)) {
-            oldWGET();
-        }
-        // else ok
+        wget_version_str = StaticStrings.NO_WGET_STR;
+        // has the user specified a path?
+        if (wget_path != null && !wget_path.equals("")) {
+            File wget_file = new File(wget_path);
+            if (wget_file.exists()) {
+            // we assume its ok if its there
+            wget_version_str = StaticStrings.WGET_STR;
+            } 
+        }
+        
+        // it hasn't been set by the user so we use the greenstone one 
+        if (wget_version_str.equals(StaticStrings.NO_WGET_STR)) {
+            // TODO fix for gs3
+            wget_path = Utility.getWGetPath(gsdl_path);
+            File wget_file = new File(wget_path);
+            if (!wget_file.exists()) {
+            // we give up trying to find one
+            missingWGET();
+            } else {
+            // we have found one
+            wget_version_str = StaticStrings.WGET_STR;
+            }
+        } 
+        
+        if (wget_version_str.equals(StaticStrings.WGET_STR)) {
+            // we have found one, should we check the version??
+            wget_version_str = testWGetVersion(wget_path);
+            if (wget_version_str.equals(StaticStrings.WGET_OLD_STR)) {
+            oldWGET();
+            }
+        }
+        
+        // tell the config the new values
+        config.setWGetPath(wget_path);
+        config.setWGetVersion(wget_version_str);
         }
         // Size and place the frame on the screen
@@ -709 +736 @@
             // Test for the presence of a WGet version. This is only useful if the user has enabled mirroring. Note that mirroring can be enabled by running the GLI with -mirror, editing the config.xml for GLI, or through a new option on the connections page of the preferences.
             else if(argument_name.equals(StaticStrings.WGET_ARGUMENT)) {
-            if(argument_value.startsWith(StaticStrings.WGET_STR)) {
-                wget_version_str = StaticStrings.WGET_STR;
-                wget_path = argument_value.substring(StaticStrings.WGET_STR.length());
-            }
-            else if(argument_value.startsWith(StaticStrings.WGET_OLD_STR)) {
-                wget_version_str = StaticStrings.WGET_OLD_STR;
-                wget_path = argument_value.substring(StaticStrings.WGET_OLD_STR.length());
-            }
+            wget_version_str = StaticStrings.WGET_STR;
+            wget_path = argument_value;
             }
         }
@@ -875 +896 @@
      * @see org.greenstone.gatherer.Configuration
      */
-    private void loadConfig(String gsdl_path, String gsdl3_path, String exec_path, String perl_path, boolean mirroring_enabled, String wget_version_str, String wget_path, String site_name) {
+    private void loadConfig(String gsdl_path, String gsdl3_path, String exec_path, String perl_path, boolean mirroring_enabled, String site_name) {
     try {
-        config = new Configuration(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, wget_version_str, wget_path, site_name);
+        config = new Configuration(gsdl_path, gsdl3_path, exec_path, perl_path, mirroring_enabled, site_name);
     }
     catch (Exception error) {
@@ -1029 +1050 @@
     }
 
+    // TODO fill this in
+    private String testWGetVersion(String wget_path) {
+    return StaticStrings.WGET_STR;
+    }
+    
     /** This private class contains an instance of an external application running within a JVM shell. It is important that this process sits in its own thread, but its more important that when we exit the Gatherer we don't actually System.exit(0) the Gatherer object until the user has volunteerily ended all of these child processes. Otherwise when we quit the Gatherer any changes the users may have made in external programs will be lost and the child processes are automatically deallocated. */
     private class ExternalApplication