Changeset 13026

Timestamp:

2006-10-06T09:44:45+13:00 (18 years ago)

Author:

mdewsnip

Message:

Removed all the old WGet stuff.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Configuration.java (modified) (3 diffs)
• Gatherer.java (modified) (5 diffs)
• GetOpt.java (modified) (2 diffs)
• gui/DownloadPane.java (modified) (1 diff)
• util/StaticStrings.java (modified) (2 diffs)

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

@@ -126 +126 @@
     static private int cache_miss = 0;
 
-    static private String wget_path = null;
-    static private String wget_version_str = StaticStrings.NO_WGET_STR;
-
     static public URL gliserver_url = null;
     static public URL library_url = null;
@@ -700 +697 @@
     static public String getGS3ScriptPath() {
     return gsdl3_src_path + "bin" + File.separator + "script" + File.separator;
-    }
-
-    static public String getWGetPath() {
-    return (wget_path != null ? wget_path : "");
-    }
-
-    static public String getWGetVersion() {
-    return (wget_version_str != null ? wget_version_str : StaticStrings.NO_WGET_STR);
     }
 
@@ -956 +945 @@
     }
 
-    static public void setWGetPath(String path) {
-    wget_path  = path;
-    }
-
-    static public void setWGetVersion(String version) {
-    wget_version_str = version;
-    }
-
     static private void updateUI() {
     // Buttons

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

@@ -184 +184 @@
     init(go.gsdl_path, go.gsdl3_path, go.gsdl3_src_path, go.local_library_path, go.library_url_string, 
          go.gliserver_url_string, go.debug, go.perl_path, go.no_load, go.filename, go.site_name,
-         go.servlet_path, go.wget_path);
+         go.servlet_path);
     }
 
@@ -191 +191 @@
              String library_url_string, String gliserver_url_string, boolean debug_enabled,
              String perl_path, boolean no_load, String open_collection, 
-             String site_name, String servlet_path, String wget_path) 
+             String site_name, String servlet_path) 
     {
     if (gsdl3_path != null && !gsdl3_path.equals("")) {
@@ -350 +350 @@
             missingPERL();
         }
-        }
-
-        boolean download_workflow = Configuration.get("workflow.download", false);
-        if (download_workflow) {
-        // If the WGet path hasn't been specified by the user, try the Greenstone one
-        if (wget_path == null) {
-            String wget_file_path = gsdl_path + "bin" + File.separator;
-            if (Utility.isWindows()) {
-            wget_file_path += "windows" + File.separator + "wget.exe";
-            }
-            else if (Utility.isMac()) {
-            wget_file_path += "darwin" + File.separator + "wget";
-            }
-            else {
-            wget_file_path += "linux" + File.separator + "wget";
-            }
-            if (new File(wget_file_path).exists()) {
-            wget_path = wget_file_path;
-            }
-        }
-
-        // 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)) {
-            oldWGET();
-            }
-        }
-
-        // Store the new values in the configuration
-        DebugStream.println("WGet path: " + wget_path);
-        Configuration.setWGetPath(wget_path);
-        Configuration.setWGetVersion(wget_version_str);
         }
 
@@ -790 +751 @@
     static private void missingPERL() {
     WarningDialog dialog = new WarningDialog("warning.MissingPERL", "MissingPERL.Title", Dictionary.get("MissingPERL.Message"), null, false);
-    dialog.display();
-    dialog.dispose();
-    dialog = null;
-    }
-
-    /** Prints a warning message about missing a valid WGet path, which although not fatal means mirroring won't work */
-    static public void missingWGET() {
-    WarningDialog dialog = new WarningDialog("warning.MissingWGET", "MissingWGET.Title", Dictionary.get("MissingWGET.Message"), null, false);
-    dialog.display();
-    dialog.dispose();
-    dialog = null;
-    }
-
-    /** Prints a warning message about having an old version of WGet. not fatal, but mirroring may not work properly */
-    static public void oldWGET() {
-    WarningDialog dialog = new WarningDialog("warning.OldWGET", "OldWGET.Title", Dictionary.get("OldWGET.Message"), null, false);
     dialog.display();
     dialog.dispose();
@@ -837 +782 @@
     }
 
-
-    // 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. */

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

@@ -52 +52 @@
     public String site_name = null; // for GS3
     public String servlet_path = null;
-    public String wget_path = null;
     public String metadata_path = null;
 
@@ -230 +229 @@
             // 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;
-                } 
-            }
-            }
                     else if(argument_name.equals(StaticStrings.METADATA_PATH)){
             if (argument_value != null && !argument_value.equals("")) {

trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -375 +375 @@
         return;
     }
-    // Lets see what warning message we should display, if any.
-    String wget_version_str = Configuration.getWGetVersion();
-    if(wget_version_str.equals(StaticStrings.NO_WGET_STR)) {
-        // If there was no WGet available then downloading is disabled entirely
-        download_button_enabled = false;
-        // And we tell the user why.
-      Gatherer.missingWGET();
-    }
-    else if(wget_version_str.equals(StaticStrings.WGET_OLD_STR)) {
-        // Downloading is enabled
-        download_button_enabled = true;
-        // But we display a preventable warning message about the path problems.
-        Gatherer.oldWGET();
-    }
-    // Otherwise version must be ok
-    else {
-        download_button_enabled = true;
-    }
+
     // It is also a good time to determine if the download should be enabled - ie if its allowed to be enabled and a valid URL is present in the field.
+    download_button_enabled = true;
     //download_button.setEnabled(download_button_enabled);
     }

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

@@ -160 +160 @@
     static final public String NEWLINE_CHARACTER = "\\";
     static final public String NO_LOAD_ARGUMENT = "-no_load";
-    static final public String NO_WGET_STR = "NoWGet";
     static final public String ONE_CHARACTER = "1";
     static final public String OPEN_PARENTHESIS_CHARACTER = "(";
@@ -211 +210 @@
     static final public String VALUE_ATTRIBUTE = "value";
     static final public String VERSION_ATTRIBUTE = "version";
-    static final public String WGET_ARGUMENT = "-wget";
-    static final public String WGET_OLD_STR = "<WGet1.9";
-    static final public String WGET_STR = "WGet1.9";
     static final public String WIN_9X_OPEN_COMMAND = "command.com /c start \"%1\"";
     static final public String WIN_OPEN_COMMAND = "cmd.exe /c start \"\" \"%1\"";