Changeset 9217

Timestamp:

2005-03-01T10:39:23+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up a few problems with setting the wget path manually from the gli.sh file, and getting the default Greenstone wget path on the Mac.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (4 diffs)
• GathererApplet.java (modified) (1 diff)
• GathererProg.java (modified) (1 diff)
• GetOpt.java (modified) (3 diffs)
• util/Utility.java (modified) (1 diff)

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

@@ -124 +124 @@
                String library_url_string, boolean debug_enabled, String perl_path, 
                boolean no_load, String open_collection, 
-               String site_name, String servlet_path, 
-               String wget_version_str, String wget_path) 
+               String site_name, String servlet_path, String wget_path) 
     {
     if (gsdl3_path != null && !gsdl3_path.equals("")) {
@@ -247 +246 @@
         }
 
-        // also check for wget
         boolean download_workflow = Configuration.get("workflow.download", false);
         if (download_workflow) {
-        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 the WGet path hasn't been specified by the user, try the Greenstone one
+        if (wget_path == null) {
+            File wget_file = new File(Utility.getWGetPath(gsdl_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;
+            wget_path = Utility.getWGetPath(gsdl_path);
             }
-        } 
-        
-        if (wget_version_str.equals(StaticStrings.WGET_STR)) {
-            // we have found one, should we check the version??
+        }
+
+        // If we still don't have a WGet path, give up (there isn't anything else we can do)
+        String wget_version_str = null;
+        if (wget_path == null) {
+            wget_version_str = StaticStrings.NO_WGET_STR;
+            missingWGET();
+        }
+        // Otherwise check the version of WGet
+        else {
             wget_version_str = testWGetVersion(wget_path);
             if (wget_version_str.equals(StaticStrings.WGET_OLD_STR)) {
@@ -281 +269 @@
             }
         }
-        
-        // tell the config the new values
+
+        // Store the new values in the configuration
+        DebugStream.println("WGet path: " + wget_path);
         Configuration.setWGetPath(wget_path);
         Configuration.setWGetVersion(wget_version_str);
@@ -591 +580 @@
     dialog.dispose();
     dialog = null;
-   }
+    }
 
     /** Prints a warning message about a missing PERL path, which although not fatal pretty much ensures no collection creation/building will work properly in the Gatherer. */

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

@@ -169 +169 @@
                     go.library_url_string, go.debug, go.perl_path, 
                     go.no_load, go.filename, go.site_name, 
-                    go.servlet_path, go.wget_version_str, go.wget_path);
+                    go.servlet_path, go.wget_path);
 
     JButton bttn = new JButton("Launch Greenstone Librarian Interface ...");

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

@@ -103 +103 @@
                  go.library_url_string, go.debug, go.perl_path, 
                  go.no_load, go.filename, go.site_name, 
-                 go.servlet_path, go.wget_version_str, go.wget_path);
+                 go.servlet_path, go.wget_path);
     gatherer.run(size, g_man);
 

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

@@ -49 +49 @@
     public String servlet_path = null;
     public String wget_path = null;
-    public String wget_version_str = StaticStrings.NO_WGET_STR;
+
 
     public GetOpt(String[] args)
@@ -193 +193 @@
             library_url_string = argument_value;
             }
-            // Parse the path to PERL. If not provided its assumes
+            // Parse the path to PERL. If not provided it assumes
             // perl should be availble on the PATH.
             else if(argument_name.equals(StaticStrings.PERL_ARGUMENT)) {
@@ -213 +213 @@
                 perl_file = null;
             }
-            // Otherwise its fine as it is
-            }
-            // 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());
+            // Otherwise it is fine as it is
+            }
+            // Parse the path to WGet
+            else if (argument_name.equals(StaticStrings.WGET_ARGUMENT)) {
+            // Check the specified WGet file exists
+            if (argument_value != null && !argument_value.equals("")) {
+                File wget_file = new File(argument_value);
+                if (wget_file.exists()) {
+                wget_path = argument_value;
+                } 
             }
             }

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -900 +900 @@
 
     /** returns the path to the greenstone version of wget */
-    static public String getWGetPath(String gsdl_path) {
+    static public String getWGetPath(String gsdl_path)
+    {
     if (isWindows()) {
-        return gsdl_path + "bin" + File.separator + 
-        "windows" + File.separator +"wget.exe";
-    } 
-    // is it the same for macs??
-    return gsdl_path + "bin" + File.separator + 
-        "linux" + File.separator + "wget";
+        return gsdl_path + "bin" + File.separator + "windows" + File.separator + "wget.exe";
+    }
+    else if (isMac()) {
+        return gsdl_path + "bin" + File.separator + "darwin" + File.separator + "wget";
+    }
+    else {
+        return gsdl_path + "bin" + File.separator + "linux" + File.separator + "wget";
+    }
     }