Changeset 6622

Timestamp:

2004-01-27T16:35:34+13:00 (20 years ago)

Author:

jmt12

Message:

More modifications to mirroring including testing for a valid version of Wget (and complaining if its missing or it is old) and rearranging buttons on the GProgressBar

Location:

trunk/gli

Files:

• classes/xml/config.xml (modified) (1 diff)
• gli.sh (modified) (3 diffs)
• src/org/greenstone/gatherer/Configuration.java (modified) (5 diffs)
• src/org/greenstone/gatherer/Gatherer.java (modified) (8 diffs)
• src/org/greenstone/gatherer/WGet.java (modified) (2 diffs)
• src/org/greenstone/gatherer/collection/Job.java (modified) (8 diffs)
• src/org/greenstone/gatherer/file/FileAssociationManager.java (modified) (3 diffs)
• src/org/greenstone/gatherer/file/FileNode.java (modified) (1 diff)
• src/org/greenstone/gatherer/file/FileSystemModel.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/GProgressBar.java (modified) (6 diffs)
• src/org/greenstone/gatherer/gui/GUIManager.java (modified) (14 diffs)
• src/org/greenstone/gatherer/gui/MirrorPane.java (modified) (11 diffs)
• src/org/greenstone/gatherer/gui/ModalDialog.java (modified) (12 diffs)
• src/org/greenstone/gatherer/gui/NewCollectionDetailsPrompt.java (modified) (1 diff)
• src/org/greenstone/gatherer/gui/OptionsPane.java (modified) (2 diffs)
• src/org/greenstone/gatherer/gui/Preferences.java (modified) (4 diffs)
• src/org/greenstone/gatherer/gui/URLField.java (modified) (2 diffs)
• src/org/greenstone/gatherer/msm/MSMUtils.java (modified) (2 diffs)
• src/org/greenstone/gatherer/util/AppendLineOnlyFileDocument.java (modified) (2 diffs)
• src/org/greenstone/gatherer/util/StaticStrings.java (modified) (4 diffs)
• src/org/greenstone/gatherer/util/SynchronizedTreeModelTools.java (modified) (1 diff)

trunk/gli/classes/xml/config.xml

@@ -116 +116 @@
     <Argument name="warning.MissingMDS">true</Argument>
     <Argument name="warning.NoMetadataSetsSelected">true</Argument>
+    <Argument name="warning.OldWGet">true</Argument>
     <Argument name="warning.TitleClashes">true</Argument>
     <!-- Workflow -->

trunk/gli/gli.sh

@@ -19 +19 @@
 
 ##  ---- Determine GSDLHOME ----
-gsdlpath=
+gsdlpath=/research/jmt12/gsdl
 
 # Some users may set the above line manually
@@ -119 +119 @@
 fi
 
+## ---- Check WGet exists ----
+wgetpath=/home/jmt12/local/bin/wget
+
+wok="NoWGet"
+# Some users may set the above line manually
+if [ "$wgetpath" == "" ]; then
+    # Check if WGet is on the search path
+    wgetpath=`which wget 2> /dev/null`
+fi
+
+# Check that a WGet executable has been found
+echo "Checking WGet: $wgetpath"
+if [ ! -x "$wgetpath" ]; then
+    echo
+    echo "Failed to locate an appropriate version of WGet. Web mirroring will"
+    echo "be disabled. Greenstone Librarian Interface requires WGet installed"
+    echo "in order to fully access this feature."
+else
+    ## -- Check the version of WGet is new enough (1.9 or higher) to run properly --
+    wgetversion=`$wgetpath --version 2>&1 | sed -n 's/^GNU Wget \(.*\)/\1/p'`    
+    wvmajor=`echo $wgetversion | sed -n 's/^\([0-9]*\).*$/\1/p'`
+    wvminor=`echo $wgetversion | sed -n 's/^[0-9]*\.\(.*\)$/\1/p'`
+
+    wok="WGet1.9"
+    if [ $wvmajor -lt 1 ] ; then
+    wok="<WGet1.9"
+    fi
+    if [ $wvmajor -eq 1 ] && [ $wvminor -lt 9 ] ; then
+    wok="<WGet1.9"
+    fi
+    if [ $wok == "<WGet1.9" ] ; then
+    echo
+    echo "The version of the WGet you have installed has a known bug when"
+    echo "mirroring files which contain encoded characters such as space and"
+    echo "tilde in their URL. While this shouldn't be a problem, we recommend"
+        echo "installing WGet 1.9 or higher."
+    fi
+fi
 
 ## ---- Check that the GLI has been compiled ----
@@ -147 +185 @@
 # -Xloggc:<file>   Write garbage collection log
 
-java -classpath classes/:GLI.jar:lib/apache.jar:lib/calpa.jar:lib/jp.jar:lib/polloxml.jar:lib/qfslib.jar:lib/skinlf.jar org.greenstone.gatherer.Gatherer -gsdl $GSDLHOME $*
+java -classpath classes/:GLI.jar:lib/apache.jar:lib/calpa.jar:lib/jp.jar:lib/polloxml.jar:lib/qfslib.jar:lib/skinlf.jar org.greenstone.gatherer.Gatherer -gsdl $GSDLHOME -wget $wok$wgetpath $*
 
 echo "Done!"

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

@@ -102 +102 @@
     /** The screen size of the desktop the Gatherer will be displayed on. */
     public Dimension screen_size = Toolkit.getDefaultToolkit().getScreenSize();
+
+    /** If true, overrides the mirroring enabled setting in the config.xml file. */
+    private boolean mirroring_enabled = false;
     /** Collection level configuration (which in some cases overrides general configuration. */
     private Document collection_config;
@@ -112 +115 @@
     private int cache_hit = 0;
     private int cache_miss = 0;
+
+    private String wget_path = null;
+    private String wget_version_str = StaticStrings.NO_WGET_STR;
+
     public URL exec_address = null;
 
@@ -119 +126 @@
      * @param perl_path The path to the PERL executable, as a <strong>String</strong>.
      */
-    public Configuration(String gsdl_path, String exec_path, String perl_path) {
+    public Configuration(String gsdl_path, String exec_path, String perl_path, boolean mirroring_enabled, String wget_version_str, String wget_path) {
     super();
     this.gsdl_path = gsdl_path;
     this.exec_path = exec_path;
+    this.mirroring_enabled = mirroring_enabled;
+    this.wget_version_str = wget_version_str;
+    this.wget_path = wget_path;
+
     // The exec_path may contain an url address, in which case we blindly use that and leave it up to the user to worry about settings and resetting.
     Gatherer.println("EXEC_PATH = " + exec_path);
@@ -256 +267 @@
     /** The default get action retrieves the named property from the desired configuration, and returns a true or false. */
     public boolean get(String property, boolean general) {
+    if(general && mirroring_enabled && property.equals(StaticStrings.WORKFLOW_MIRROR)) {
+        return mirroring_enabled;
+    }
     String raw = getString(property, general);
     return (raw != null && raw.equalsIgnoreCase("true"));
@@ -574 +588 @@
 
     public String getWGetPath() {
-    return "/usr/bin/wget";
+    return wget_path;
+    }
+
+    public String getWGetVersion() {
+    return wget_version_str;
     }
 

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

@@ -165 +165 @@
     }
 
-    public void run(Dimension size, String gsdl_path, String exec_path, boolean debug_enabled, String perl_path, boolean no_load, Splash splash, String open_collection) {
+    public void run(Dimension size, String gsdl_path, String exec_path, boolean debug_enabled, String perl_path, boolean no_load, Splash splash, String open_collection, boolean mirroring_enabled, String wget_version_str, String wget_path) {
 
     // This will hopefully catch ctrl-c and terminate, and exit gracefully. However it is platform specific, and may not be supported by some JVMs.
@@ -199 +199 @@
     try {
         // Load Config
-        loadConfig(gsdl_path, exec_path, perl_path);
+        loadConfig(gsdl_path, exec_path, perl_path, mirroring_enabled, wget_version_str, wget_path);
 
         // MDSTesting
@@ -499 +499 @@
 
     boolean debug = false;
+    boolean mirroring_enabled = false;
     boolean no_load = false;
     Dictionary dictionary = new Dictionary(null, null); // Default dictionary. Only used for starting error messages.
@@ -507 +508 @@
     String gsdl_path = null;
     String perl_path = null;
+    String wget_path = null;
+    String wget_version_str = StaticStrings.NO_WGET_STR;
     // Parse arguments
     int argument_index = 0;
     String next_token = null;
     while(argument_index < args.length || next_token != null) {
-        // 1. We start by attempting to parse an argument name. An argument must start with a '-', and should not contain spaces. If anything else is encountered it is ignored.
-        String argument_name = null;
-        if(next_token == null) {
-            next_token = args[argument_index];
-            argument_index++;
-        }
-        if(next_token.startsWith(StaticStrings.MINUS_CHARACTER)) {
-            // Trim second '-' just to be kind to Unixy-type people
-            if(next_token.startsWith(StaticStrings.MINUS_CHARACTER + StaticStrings.MINUS_CHARACTER)) {
-                argument_name = next_token.substring(1);
+        // 1. We start by attempting to parse an argument name. An argument must start with a '-', and should not contain spaces. If anything else is encountered it is ignored.
+        String argument_name = null;
+        if(next_token == null) {
+        next_token = args[argument_index];
+        argument_index++;
+        }
+        if(next_token.startsWith(StaticStrings.MINUS_CHARACTER)) {
+        // Trim second '-' just to be kind to Unixy-type people
+        if(next_token.startsWith(StaticStrings.MINUS_CHARACTER + StaticStrings.MINUS_CHARACTER)) {
+            argument_name = next_token.substring(1);
+        }
+        else {
+            argument_name = next_token;
+        }
+        }
+        next_token = null;
+        // 2. If we now have an argument name we continue by attempting to parse a value. A value is taken to be the sequence of space seperated Strings between the last argument name and up to but not including the next argument name. Of course an argument needn't have any value (ie -debug, -help), in which case value will be null.
+        if(argument_name != null) {
+        String argument_value = null;
+        StringBuffer argument_value_buffer = new StringBuffer("");
+        while(argument_index < args.length && next_token == null) {
+            next_token = args[argument_index];
+            argument_index++;
+            // If we just parsed an arbitary String then append it to value, followed by a single space
+            if(!next_token.startsWith(StaticStrings.MINUS_CHARACTER)) {
+            argument_value_buffer.append(next_token);
+            argument_value_buffer.append(StaticStrings.SPACE_CHARACTER);
+            next_token = null;
+            }
+            // If the argument token retrieved is an argument name, then leave it in next_token, which will cause the argument parsing process to move onto the next step.
+        }
+        // If a value now exists in argument buffer, retrieve it. Remove the last character as it will be an erroneous space.
+        if(argument_value_buffer.length() > 0) {
+            argument_value = argument_value_buffer.substring(0, argument_value_buffer.length() - 1);
+        }
+        
+        // 3. We now have the argument name, and any associated value. We are ready to store the data in the appropriate variables.
+        Gatherer.println("Parsed Argument: name=" + argument_name + (argument_value != null ? (", value=" + argument_value) : ", no value"));
+        // 3a. First those arguments that have no associated value
+        if(argument_value == null) {
+            if(argument_name.equals(StaticStrings.HELP_ARGUMENT)) {
+            printUsage(dictionary);
+            System.exit(0);
+            }
+            // Run GLI in debug mode. Produces debug log plus extra messages.
+            else if(argument_name.equals(StaticStrings.DEBUG_ARGUMENT)) {
+            debug = true;
+            }
+            // Forces no loading on previous collection.
+            else if(argument_name.equals(StaticStrings.NO_LOAD_ARGUMENT)) {
+            no_load = true;
+            filename = null;
+            }
+            // Run the GLI with mirroring enabled
+            else if(argument_name.equals(StaticStrings.MIRROR_ARGUMENT)) {
+            mirroring_enabled = true;
+            }
+            /* I've got a sneak suspicion Aqua look and feel is not free domain
+               // Specify the use of Greenstone LAF.
+               else if(argument_name.equals(StaticStrings.SKIN_ARGUMENT)) {
+               // SkinLF
+               try {
+               SkinLookAndFeel.setSkin(SkinLookAndFeel.loadThemePackDefinition(SkinUtils.toURL(new File(SKIN_DEFINITION_FILE))));
+               SkinLookAndFeel.enable();
+               }
+               catch (Exception error) {
+               ///ystem.err.println("Error: " + error);
+               error.printStackTrace();
+               }
+               }
+            */
+        }
+        // 3b. Now for those that do
+        else {
+            // Parse the path to the GSDL. Required argument.
+            if(argument_name.equals(StaticStrings.GSDL_ARGUMENT)) {
+            if(argument_value.endsWith(File.separator)) {
+                gsdl_path = argument_value;
             }
             else {
-                argument_name = next_token;
-            }
-        }
-        next_token = null;
-        // 2. If we now have an argument name we continue by attempting to parse a value. A value is taken to be the sequence of space seperated Strings between the last argument name and up to but not including the next argument name. Of course an argument needn't have any value (ie -debug, -help), in which case value will be null.
-        if(argument_name != null) {
-            String argument_value = null;
-            StringBuffer argument_value_buffer = new StringBuffer("");
-            while(argument_index < args.length && next_token == null) {
-            next_token = args[argument_index];
-            argument_index++;
-                // If we just parsed an arbitary String then append it to value, followed by a single space
-            if(!next_token.startsWith(StaticStrings.MINUS_CHARACTER)) {
-                argument_value_buffer.append(next_token);
-                argument_value_buffer.append(StaticStrings.SPACE_CHARACTER);
-                next_token = null;
-            }
-                // If the argument token retrieved is an argument name, then leave it in next_token, which will cause the argument parsing process to move onto the next step.
-            }
-            // If a value now exists in argument buffer, retrieve it. Remove the last character as it will be an erroneous space.
-            if(argument_value_buffer.length() > 0) {
-            argument_value = argument_value_buffer.substring(0, argument_value_buffer.length() - 1);
-            }
-            
-            // 3. We now have the argument name, and any associated value. We are ready to store the data in the appropriate variables.
-            Gatherer.println("Parsed Argument: name=" + argument_name + (argument_value != null ? (", value=" + argument_value) : ", no value"));
-            // 3a. First those arguments that have no associated value
-            if(argument_value == null) {
-            if(argument_name.equals(StaticStrings.HELP_ARGUMENT)) {
-                printUsage(dictionary);
-                System.exit(0);
-                }
-                // Run GLI in debug mode. Produces debug log plus extra messages.
-                else if(argument_name.equals(StaticStrings.DEBUG_ARGUMENT)) {
-                debug = true;
-                }
-            // Forces no loading on previous collection.
-            else if(argument_name.equals(StaticStrings.NO_LOAD_ARGUMENT)) {
-                no_load = true;
-                filename = null;
-            }
-            /* I've got a sneak suspicion Aqua look and feel is not free domain
-            // Specify the use of Greenstone LAF.
-            else if(argument_name.equals(StaticStrings.SKIN_ARGUMENT)) {
-                // SkinLF
-                try {
-                SkinLookAndFeel.setSkin(SkinLookAndFeel.loadThemePackDefinition(SkinUtils.toURL(new File(SKIN_DEFINITION_FILE))));
-                SkinLookAndFeel.enable();
-                }
-                catch (Exception error) {
-                ///ystem.err.println("Error: " + error);
-                error.printStackTrace();
-                }
-                }
-            */
-            }
-            // 3b. Now for those that do
-            else {
-            // Parse the path to the GSDL. Required argument.
-                if(argument_name.equals(StaticStrings.GSDL_ARGUMENT)) {
-                if(argument_value.endsWith(File.separator)) {
-                gsdl_path = argument_value;
+                gsdl_path = argument_value + File.separator;
+            }
+            }
+            // Specify a collection to load initially. Could be used for file associations.
+            else if(argument_name.equals(StaticStrings.LOAD_ARGUMENT)) {
+            filename = argument_value;
+            no_load = false;
+            }
+            // Parse the url to a running web server, or a file path to the local library server.
+            else if(argument_name.equals(StaticStrings.LIBRARY_ARGUMENT)) {
+            exec_path = argument_value;
+            // If there is no colon in first five characters of the exec_path (which would either be an existing protocol, or a windows file path to say a local library), we can append the protocol http://.
+            if(argument_value.lastIndexOf(StaticStrings.COLON_CHARACTER, 5) == -1) {
+                exec_path = StaticStrings.HTTP_PROTOCOL_STR + argument_value;
+            }
+            else {
+                exec_path = argument_value;
+            }
+            // If the user has given us an address, but it ends with a '/' we assume we're using the greenstone library.cgi
+            if(exec_path.startsWith(StaticStrings.HTTP_PROTOCOL_STR) && exec_path.endsWith(StaticStrings.URL_SEPARATOR_CHARACTER)) {
+                exec_path = exec_path + StaticStrings.LIBRARY_STR;
+            }
+            }
+            // Parse the path to PERL. If not provided its assumes perl should be availble on the PATH.
+            else if(argument_name.equals(StaticStrings.PERL_ARGUMENT)) {
+            perl_path = argument_value;
+            // Test whether this points to the Perl bin directory or the Perl executable itself.
+            File perl_file = new File(perl_path);
+            if(perl_file.isDirectory()) {
+                // If this is windows we create a child file perl.exe, otherwise we create perl
+                if(Utility.isWindows()) {
+                perl_file = new File(perl_file, Utility.PERL_EXECUTABLE_WINDOWS);
                 }
                 else {
-                gsdl_path = argument_value + File.separator;
+                perl_file = new File(perl_file, Utility.PERL_EXECUTABLE_UNIX);
                 }
-                }
-            // Specify a collection to load initially. Could be used for file associations.
-                else if(argument_name.equals(StaticStrings.LOAD_ARGUMENT)) {
-                filename = argument_value;
-                no_load = false;
-                }
-            // Parse the url to a running web server, or a file path to the local library server.
-                else if(argument_name.equals(StaticStrings.LIBRARY_ARGUMENT)) {
-                    exec_path = argument_value;
-                    // If there is no colon in first five characters of the exec_path (which would either be an existing protocol, or a windows file path to say a local library), we can append the protocol http://.
-                    if(argument_value.lastIndexOf(StaticStrings.COLON_CHARACTER, 5) == -1) {
-                        exec_path = StaticStrings.HTTP_PROTOCOL_STR + argument_value;
-                    }
-                    else {
-                        exec_path = argument_value;
-                    }
-                    // If the user has given us an address, but it ends with a '/' we assume we're using the greenstone library.cgi
-                    if(exec_path.startsWith(StaticStrings.HTTP_PROTOCOL_STR) && exec_path.endsWith(StaticStrings.URL_SEPARATOR_CHARACTER)) {
-                        exec_path = exec_path + StaticStrings.LIBRARY_STR;
-                    }
-                }
-                // Parse the path to PERL. If not provided its assumes perl should be availble on the PATH.
-                else if(argument_name.equals(StaticStrings.PERL_ARGUMENT)) {
-                    perl_path = argument_value;
-                    // Test whether this points to the Perl bin directory or the Perl executable itself.
-                    File perl_file = new File(perl_path);
-                    if(perl_file.isDirectory()) {
-                        // If this is windows we create a child file perl.exe, otherwise we create perl
-                        if(Utility.isWindows()) {
-                        perl_file = new File(perl_file, Utility.PERL_EXECUTABLE_WINDOWS);
-                        }
-                        else {
-                        perl_file = new File(perl_file, Utility.PERL_EXECUTABLE_UNIX);
-                        }
-                        // And store this new path.
-                        perl_path = perl_file.getAbsolutePath();
-                        perl_file = null;
-                    }
-                    // Otherwise its fine as it is
-                }
-            }
-        }
-        // Argument name was null, nothing to be done.
+                // And store this new path.
+                perl_path = perl_file.getAbsolutePath();
+                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());
+            }
+            }
+        }
+        }
+        // Argument name was null, nothing to be done.
     }
     next_token = null;
@@ -639 +657 @@
     Splash splash = new Splash();
     dictionary.destroy();
-    gatherer.run(size, gsdl_path, exec_path, debug, perl_path, no_load, splash, filename);
+    gatherer.run(size, gsdl_path, exec_path, debug, perl_path, no_load, splash, filename, mirroring_enabled, wget_version_str, wget_path);
     }
 
@@ -766 +784 @@
      * @see org.greenstone.gatherer.Configuration
      */
-    private void loadConfig(String gsdl_path, String exec_path, String perl_path) {
+    private void loadConfig(String gsdl_path, String exec_path, String perl_path, boolean mirroring_enabled, String wget_version_str, String wget_path) {
     try {
-        config = new Configuration(gsdl_path, exec_path, perl_path);
+        config = new Configuration(gsdl_path, exec_path, perl_path, mirroring_enabled, wget_version_str, wget_path);
     }
     catch (Exception error) {
@@ -1029 +1047 @@
             if (exitCode != 0) { // if Netscape or mozilla was not open
             Gatherer.println("couldn't do remote, trying original command");
-            printArray(commands);
+            if(debug != null) {
+                printArray(commands);
+            }
             process = rt.exec(commands); // try the original command
             }
@@ -1060 +1080 @@
     public void printArray(String [] array) {
         for(int i = 0; i < array.length; i++) {
+        debug.print(array[i]+" ");
         System.err.println(array[i]+" ");
         }

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

@@ -258 +258 @@
     Gatherer.println("About to create a new job");
     // If it was decided not to download page requisites, then create the destination by basing it on the given destination, but appending the url host and paths. If page requisites is used then WGet will do this for us
-    if(!page_requisites) {
-        System.err.println("Initially destination: " + destination);
+    if(!page_requisites && depth == 0) {
+        Gatherer.println("Initially destination: " + destination);
         String almost_the_entire_path = url.getPath();
         int index = -1;
@@ -265 +265 @@
         almost_the_entire_path = almost_the_entire_path.substring(0, index);
         }
-        destination = destination + url.getHost() + almost_the_entire_path + "/";
-        System.err.println("Finale destination:    " + destination);
+        destination = destination + url.getHost() + almost_the_entire_path;
+        Gatherer.println("Final destination:    " + destination);
     }
     Job new_job = new Job(Gatherer.config.get("mirroring.debug", false), no_parents, other_hosts, page_requisites, Gatherer.config.get("mirroring.quiet", false), url, depth, destination, Gatherer.config.proxy_pass, Gatherer.config.proxy_user, this, simple);
+    // Tell it to run as soon as possible
+    new_job.setState(Job.RUNNING);
+
     // Add to job_queue job list.
     job_queue.add(new_job);

trunk/gli/src/org/greenstone/gatherer/collection/Job.java

@@ -221 +221 @@
         if(user_pass.indexOf("@") != -1) {
         // Write the use proxy command
-        command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=" + user_pass.substring(0, user_pass.indexOf("@")) + " --proxy-passwd=" + user_pass.substring(user_pass.indexOf("@") + 1) + " -Y on ";
+        command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=\"" + user_pass.substring(0, user_pass.indexOf("@")) + "\" --proxy-passwd=*** -Y on ";
 
         }
@@ -235 +235 @@
     // or not. In which case we ensure links are rewritten.
     else {
+        command = command + "-k ";
     }
 
@@ -289 +290 @@
             String current_file_downloading = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
             if(!ignore_for_robots) {
-            System.err.println("Not ignore for robots");
+            Gatherer.println("Not ignore for robots");
             // Download complete
             downloadComplete(current_file_downloading);
             }
             else {
-            System.err.println("Ignore for robots");
+            Gatherer.println("Ignore for robots");
             ignore_for_robots = false;
             }
@@ -382 +383 @@
     // Parse arguments into array.
     args.add(Utility.BASE_DIR + "wget");
-    //args.add("-k");
     args.add("-d");
     args.add("-o");
@@ -458 +458 @@
     public void downloadComplete(String current_file_downloading) {
     progress.downloadComplete();
-    ///ystem.err.println("Current File: " + current_file_downloading);
+    Gatherer.println("Current File: " + current_file_downloading);
     //WorkspaceTreeModel.refreshWebCacheMappings();
     if(Gatherer.g_man.collection_pane.workspace_tree != null) {
@@ -473 +473 @@
         // Add download cache name 
         /** @todo - add to dictionary */
-        raw_path.add(0, "Mirror Cache");
+        raw_path.add(0, "Mirroring.Mirror_Cache");
         // And the root node
         raw_path.add(0, tree_model.getRoot());
@@ -481 +481 @@
         FileNode destination_node = (FileNode) tree_model.getNode(destination_path);
         // destination_path = null;
-        FileNode new_file_node = new FileNode(new_file);
-        SynchronizedTreeModelTools.insertNodeInto(tree_model, destination_node, new_file_node);
-        System.err.println("Ready to insert new FileNode.");
-        System.err.println("Model:            " + tree_model);
-        System.err.println("Destination path: " + destination_path);
-        System.err.println("Destination node: " + destination_node);
-        System.err.println("New node:         " + new_file_node);
-
-        new_file_node = null;
+        //FileNode new_file_node = new FileNode(new_file);
+
+        // It suddenly occurs to me that by retrieving the destination path, we are causing the potential destination node to map its children which includes the file which I am about to add. Hence I was ending up with two copies.
+        ///atherer.println("Ready to insert new FileNode.");
+        Gatherer.println("Model:            " + tree_model);
+        Gatherer.println("Destination path: " + destination_path);
+        destination_node.unmap();
+        ///atherer.println("Destination node: " + destination_node);
+        ///atherer.println("New node:         " + new_file_node);
+        //SynchronizedTreeModelTools.insertNodeInto(tree_model, destination_node, new_file_node);
+
+        //new_file_node = null;
         destination_node = null;
         tree_model = null;
@@ -554 +557 @@
     }
 
+    public void setState(int state) {
+    previous_state = this.state;
+    this.state = state;
+    }
+
     /** A convinence call.
      * @return A String representing the url of the initial url (root node of the mirrored tree).

trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -105 +105 @@
 
     public String getBrowserCommand(String url) {
-    System.err.println("Get browser command: " + url);
+    Gatherer.println("Get browser command: " + url);
     // First off we try to retrieve one from the configuration
     String command = Gatherer.config.getPreviewCommand();
@@ -111 +111 @@
     if(command != null && command.length() > 0) {
         command = command.replaceAll("%1", url);
-        System.err.println("Result = " + command);
+        Gatherer.println("Result = " + command);
         return command;
     }
@@ -164 +164 @@
     // if we haven't got a command by now, we'll never get one
     if (command == null) {
-        System.err.println("Result = " + command);
+        Gatherer.println("Result = " + command);
         return null;
     }
     // Replace %1 with the url in quotes
     command = command.replaceAll(FILENAME_ARG, url);
-    System.err.println("Result = " + command);
+    Gatherer.println("Result = " + command);
     return command;
     }

trunk/gli/src/org/greenstone/gatherer/file/FileNode.java

@@ -218 +218 @@
     /** Adds child to the receiver at index. */
     public void insert(MutableTreeNode child, int index) {
-    ///ystem.err.println("Insert " + child + " in " + this + " at index " + index + " [Model: " + model + "]");
+    Gatherer.println("Insert " + child + " in " + this + " at index " + index + " [Model: " + model + "]");
     //map();
     try {

trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java

@@ -67 +67 @@
             stale_node = (FileNode) stale_object;
         }
-        Gatherer.print("Searching for '" + stale_node + "': ");
+        Gatherer.print("Searching for '" + stale_object + "': ");
         // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
         current.map();

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

@@ -50 +50 @@
     extends JPanel 
     implements ActionListener {
+
+    static final private Dimension MINIMUM_BUTTON_SIZE = new Dimension(100, 25); 
 
     private boolean simple = false;
@@ -100 +102 @@
 
     inner_pane = new JPanel(new BorderLayout());
-    inner_pane.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
-
-    action = new GLIButton(Utility.getImage("vcrplay.gif"));
-    action.addActionListener(this);
-    action.addActionListener(owner);
-    action.setMnemonic(KeyEvent.VK_ENTER);
-    Dictionary.setTooltip(action, "Mirroring.Job.Start_Tooltip");
+    inner_pane.setBorder(BorderFactory.createEmptyBorder(2,(MINIMUM_BUTTON_SIZE.width + 2),2,2));
 
     center_pane = new JPanel(new GridLayout(3,1));
@@ -128 +124 @@
     center_pane.add(results_status);
 
-    cancel = new GLIButton(Utility.getImage("vcrstop.gif"));
+    JPanel button_pane = new JPanel();
+
+    /** @todo - add to dictionary, and rewrite existing tooltip */
+    action = new GLIButton("Mirroring.Job.Retry");
+    action.addActionListener(this);
+    action.addActionListener(owner);
+    action.setMinimumSize(MINIMUM_BUTTON_SIZE);
+    action.setMnemonic(KeyEvent.VK_A);
+    Dictionary.setTooltip(action, "Mirroring.Job.Start_Tooltip");
+
+    /** @todo - add to dictionary, and rewrite existing tooltip */
+    cancel = new GLIButton("Mirroring.Job.Cancel");
     cancel.addActionListener(owner);
     cancel.addActionListener(this);
-    cancel.setMnemonic(KeyEvent.VK_BACK_SPACE);
+    cancel.setMinimumSize(MINIMUM_BUTTON_SIZE);
+    cancel.setMnemonic(KeyEvent.VK_C);
     Dictionary.setTooltip(cancel, "Mirroring.Job.Stop_Tooltip");
 
+    // Layout - or at least some of it
+
     inner_pane.add(center_pane, BorderLayout.NORTH);
 
-    this.add(action, BorderLayout.WEST);
+    button_pane.setLayout(new GridLayout(2,1));
+    button_pane.add(action);
+    button_pane.add(cancel);
+
     this.add(inner_pane, BorderLayout.CENTER);
-    this.add(cancel, BorderLayout.EAST);
+    this.add(button_pane, BorderLayout.EAST);
 
     // Make the labels, etc update.
@@ -148 +161 @@
         if (current_action == Job.RUNNING) {
         current_action = Job.STOPPED;
-        action.setIcon(Utility.getImage("vcrplay.gif"));
-        Dictionary.setTooltip(action, "Mirroring.Job.Start_Tooltip");
-        cancel.setEnabled(true);
+        action.setEnabled(true);
         }
         else {
         current_action = Job.RUNNING;
-        action.setIcon(Utility.getImage("vcrpause.gif"));
-        Dictionary.setTooltip(action, "Mirroring.Job.Pause_Tooltip");
-        cancel.setEnabled(false);
+        action.setEnabled(false);
         }
     }
@@ -232 +241 @@
     }
     current_action = Job.RUNNING;
-    action.setIcon(Utility.getImage("vcrpause.gif"));
-    Dictionary.setTooltip(cancel, "Mirroring.Job.Pause_Tooltip");
-    // If this is a simple download, then pause is not available (nor is prematurely stopping!)
-    action.setEnabled(!simple);
-    cancel.setEnabled(false);
+    action.setEnabled(false);
     if(simple) {
         progress.setIndeterminate(true);
@@ -258 +263 @@
     //Dictionary.setText(progress, "Mirroring.Job.Mirror_Complete");
 
-    action.setIcon(Utility.getImage("vcrfastforward.gif"));
-    Dictionary.setTooltip(action, "Mirroring.Job.Restart_Tooltip");
-    action.setEnabled(true);
+    action.setEnabled(false);
     cancel.setEnabled(true);
     this.updateUI();

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

@@ -58 +58 @@
 import org.greenstone.gatherer.file.FileOpenActionListener;
 import org.greenstone.gatherer.gui.AboutDialog;
-import org.greenstone.gatherer.gui.BrowsingPane;
+//import org.greenstone.gatherer.gui.BrowsingPane;
 import org.greenstone.gatherer.gui.CollectionPane;
 import org.greenstone.gatherer.gui.CreatePane;
@@ -87 +87 @@
     implements ActionListener, ChangeListener {
     /** The browsing pane behaves much like an internet browser, or at least will some day. */
-    public BrowsingPane browser_pane = null;
+    //public BrowsingPane browser_pane = null;
     /** The collection pane is more like a file manager where you drag files from one tree to another. */
     public CollectionPane collection_pane = null;
@@ -146 +146 @@
     this.meta_audit = new MetaAuditFrame(collection_tree_sync, null);
     this.workspace_tree_sync = new TreeSynchronizer();
+    
+    // Add a focus listener to ourselves. Thus if we gain focus when a Modal Dialog should instead have it, we can try to bring the modal dialog to the fore.
+    this.addFocusListener(new GLIGUIFocusListener());
+
     // Make the Tool tip hang around for a rediculous amount of time.
     ToolTipManager.sharedInstance().setDismissDelay(10000);
@@ -156 +160 @@
     UIManager.put("FileChooser.fileNameLabelText", Dictionary.get("SaveCollectionBox.File_Name"));
     }
+
+    private class GLIGUIFocusListener
+    extends FocusAdapter {
+    public void focusGained(FocusEvent e) {
+        if(Gatherer.current_modal != null) {
+        Gatherer.current_modal.makeVisible();
+        Gatherer.current_modal.toFront();
+        }
+    }
+    }
+
     /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured. In this case we are listening to actions from the menu-bar, and should react appropriately.
       * @param event An <strong>ActionEvent</strong> containing information about the action that has occured.
@@ -304 +319 @@
         new AboutDialog(this);
     }
-    else if(esrc == menu_bar.help_browse) {
-        help.setView("huntingforfiles");
-    }
+//      else if(esrc == menu_bar.help_browse) {
+//          help.setView("huntingforfiles");
+//      }
     else if(esrc == menu_bar.help_build) {
         help.setView("producingthecollection");
@@ -347 +362 @@
      */
     public void afterDisplay() {
-    if(Gatherer.config.get("workflow.browse", true)) {
-        browser_pane.afterDisplay();
-    }
+//      if(Gatherer.config.get("workflow.browse", true)) {
+//          browser_pane.afterDisplay();
+//      }
+    mirror_pane.afterDisplay();
     metaedit_pane.afterDisplay();
     }
@@ -425 +441 @@
         // Pretty corner icon
         this.setIconImage(Utility.getImage("gatherer_small.gif").getImage());
-        // BorderLayout for the main screen. I'll try my best to avoid t
-        // hese in subcomponents as they're space greedy.
+        // BorderLayout for the main screen. I'll try my best to avoid these in subcomponents as they're space greedy.
         content_pane.setLayout(new BorderLayout());
         // Create the menu-bar and stick it up the top.
@@ -437 +452 @@
         tab_pane.setFont(Gatherer.config.getFont("general.font", false));
 
-        // May have to play with the order in which tabs are added.
-        if(Gatherer.config.get("workflow.browse", true)) {
-        browser_pane = new BrowsingPane();
-        tab_pane.addTab("GUI.Hunt", Utility.getImage("browsing.gif"), browser_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(browser_pane), Gatherer.config.get("workflow.browse", false));
-        }
-
-        if(Gatherer.config.get("workflow.mirror", true)) {
+//          // May have to play with the order in which tabs are added.
+//          if(Gatherer.config.get("workflow.browse", true)) {
+//          browser_pane = new BrowsingPane();
+//          tab_pane.addTab("GUI.Hunt", Utility.getImage("browsing.gif"), browser_pane);
+//          tab_pane.setEnabledAt(tab_pane.indexOfComponent(browser_pane), Gatherer.config.get("workflow.browse", false));
+//          }
+
+        if(Gatherer.config.get(StaticStrings.WORKFLOW_MIRROR, true)) {
         mirror_pane = new MirrorPane();
         tab_pane.addTab("GUI.Mirror", Utility.getImage("mirroring.gif"), mirror_pane);
-        tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get("workflow.mirror", false));
+        tab_pane.setEnabledAt(tab_pane.indexOfComponent(mirror_pane), Gatherer.config.get(StaticStrings.WORKFLOW_MIRROR, false));
         }
 
@@ -490 +505 @@
         //}
 
-        // Find the first tab that is enabled and select that.
-        boolean found = false;
-        for(int i = 0; !found && i < tab_pane.getTabCount(); i++) {
-        if(tab_pane.isEnabledAt(i)) {
-            tab_pane.setSelectedIndex(i);
-            found = true;
+        // Select the collect pane if it is available
+        if(Gatherer.config.get("workflow.gather", false)) {
+        tab_pane.setSelectedComponent(collection_pane);
+        }
+        // Otherwise find the first tab that is enabled and select that.
+        else {
+        boolean found = false;
+        for(int i = 0; !found && i < tab_pane.getTabCount(); i++) {
+            if(tab_pane.isEnabledAt(i)) {
+            tab_pane.setSelectedIndex(i);
+            found = true;
+            }
         }
         }
@@ -515 +536 @@
     public void exit() {
     // First of all an exit can only happen if no modal dialog is currently being displayed. Something is creating a modal dialog but not disposing of it.
-    //if(Gatherer.current_modal != null) {
-    //    return;
-    //}
+    if(Gatherer.current_modal != null) {
+        System.err.println("There is a modal dialog open.");
+        Gatherer.current_modal.makeVisible();
+        Gatherer.current_modal.toFront();
+        return;
+    }
 
     boolean cont = true;
@@ -871 +895 @@
 
     menu_bar.tabSelected(tab_pane.getSelectedIndex());
-    if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(collection_pane)) {
+    int selected_index = tab_pane.getSelectedIndex();
+    if( selected_index == tab_pane.indexOfComponent(collection_pane)) {
         collection_pane.gainFocus();
         // "View assigned metadata" menu item is enabled for the "Gather" pane
         menu_bar.metadata_view.setCanEnable(true);
     }
-    else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(metaedit_pane)) {
+    else if(selected_index == tab_pane.indexOfComponent(metaedit_pane)) {
         metaedit_pane.gainFocus();
         // "View assigned metadata" menu item is enabled for the "Enrich" pane
         menu_bar.metadata_view.setCanEnable(true);
     }
-    else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(config_pane)) {
+    else if(selected_index == tab_pane.indexOfComponent(config_pane)) {
         config_pane.gainFocus();
     }
-    else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(create_pane)) {
+    else if(selected_index == tab_pane.indexOfComponent(create_pane)) {
         create_pane.gainFocus();
+    }
+    else if(selected_index == tab_pane.indexOfComponent(mirror_pane)) {
+        mirror_pane.gainFocus();
     }
     //else if(tab_pane.getSelectedIndex() == tab_pane.indexOfComponent(preview_pane)) {
@@ -973 +1001 @@
     implements Runnable {
     private boolean ready = false;
-    private int browse_pos = -1;
+    //private int browse_pos = -1;
     private int mirror_pos = -1;
     private int config_pos = -1;
@@ -984 +1012 @@
         this.ready = ready;
         this.tab_pane = tab_pane;
-        browse_pos = tab_pane.indexOfComponent(browser_pane);
+        //browse_pos = tab_pane.indexOfComponent(browser_pane);
         mirror_pos = tab_pane.indexOfComponent(mirror_pane);
         metaedit_pos = tab_pane.indexOfComponent(metaedit_pane);
@@ -992 +1020 @@
         //preview_pos = tab_pane.indexOfComponent(preview_pane);
     }
+
     public void run() {
-        if(browse_pos != -1) {
-        if(ready) {
-            tab_pane.setEnabledAt(browse_pos, Gatherer.config.get("workflow.browse", false));
-        }
-        else {
-            tab_pane.setEnabledAt(browse_pos, Gatherer.config.get("workflow.browse", true));
-        }
-        }
+//          if(browse_pos != -1) {
+//          if(ready) {
+//              tab_pane.setEnabledAt(browse_pos, Gatherer.config.get("workflow.browse", false));
+//          }
+//          else {
+//              tab_pane.setEnabledAt(browse_pos, Gatherer.config.get("workflow.browse", true));
+//          }
+//          }
         if(mirror_pos != -1) {
         if(ready) {

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

@@ -51 +51 @@
 import org.greenstone.gatherer.file.FileNode;
 import org.greenstone.gatherer.gui.GLIButton;
+import org.greenstone.gatherer.gui.URLField;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 
@@ -60 +62 @@
     extends JPanel {
 
+    private boolean download_button_enabled = false;
+    private boolean ready = false;
     private JButton download_button;
     private JCheckBox higher_checkbox;
@@ -66 +70 @@
     private JScrollPane list_scroll;
     private JComboBox depth_combobox;
-    private JTextField url_textfield;
+    private URLField url_field;
     private Vector depth_model;
     private WGet getter;
@@ -86 +90 @@
     url_label.setPreferredSize(Utility.LABEL_SIZE);
     Dictionary.registerText(url_label, "Mirroring.Source_URL");
-    url_textfield = new JTextField();
-    Dictionary.registerTooltip(url_textfield, "Mirroring.Source_URL_Tooltip");
+    url_field = new URLField(Gatherer.config.getColor("coloring.editable_foreground", false), Gatherer.config.getColor("coloring.editable_background", false), Gatherer.config.getColor("coloring.error_foreground", false), Gatherer.config.getColor("coloring.error_background", false));
+    Dictionary.registerTooltip(url_field, "Mirroring.Source_URL_Tooltip");
 
     depth_model = new Vector();
     /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(0, "0 (this page only)"));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(1, "1"));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(2, "2"));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(3, "3"));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(4, "4"));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(5, "5"));
-    /* @todo - add to dictionary */
-    depth_model.add(new DepthEntry(-1, "Unlimited"));
+    depth_model.add(new DepthEntry(0, "Mirroring.Download_Depth.Zero"));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(1, String.valueOf(1)));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(2, String.valueOf(3)));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(3, String.valueOf(3)));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(4, String.valueOf(4)));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(5, String.valueOf(5)));
+    /* @todo - add to dictionary */
+    depth_model.add(new DepthEntry(-1, "Mirroring.Download_Depth.Unlimited"));
     JPanel depth_pane = new JPanel();
     JLabel depth_label = new JLabel();
@@ -121 +125 @@
     
     /* @todo - add to dictionary */
-    JLabel further_label = new JLabel("For further options see File->Preferences->Connection");
+    JLabel further_label = new JLabel("Mirroring.Further_Options");
 
     JPanel button_pane = new JPanel();
@@ -130 +134 @@
     // Connect
     download_button.addActionListener(new DownloadButtonListener());
+    url_field.getDocument().addDocumentListener(new DownloadButtonEnabler());
 
     // Layout
     url_pane.setLayout(new BorderLayout());
     url_pane.add(url_label, BorderLayout.WEST);
-    url_pane.add(url_textfield, BorderLayout.CENTER);
+    url_pane.add(url_field, BorderLayout.CENTER);
 
     depth_pane.setLayout(new GridLayout(1,3));
@@ -165 +170 @@
     }
 
+    public void afterDisplay() {
+    ready = true;
+    }
+
     public void collectionChanged(boolean ready) {
     }
 
+    /** This method is called whenever the Mirror pane is brought into focus and is a good time to display a warning message if WGet is not available or of an older, problematic, version.
+     */
+    public void gainFocus() {
+    if(!ready) {
+        return;
+    }
+    // Lets see what warning message we should display, if any.
+    String wget_version_str = Gatherer.config.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.
+        /** @todo - add to dictionary */
+        JOptionPane.showMessageDialog(Gatherer.g_man, "Mirroring.No_WGet", "Mirroring.No_WGet_Title", JOptionPane.ERROR_MESSAGE);
+    }
+    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.
+        WarningDialog dialog = new WarningDialog("warning.OldWGet", false);
+        dialog.display();
+        dialog.dispose();
+        dialog = null;
+    }
+    // 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.setEnabled(download_button_enabled && !url_field.isEmpty() && url_field.validateURL());
+    }
+
     public void setURL(String url) {
-    url_textfield.setText(url);
+    url_field.setText(url);
     }
 
@@ -175 +216 @@
     static public FileNode getWebCacheMapping()
     {
-    if (Gatherer.config.get("workflow.mirror", false) && Gatherer.c_man.ready()) {
+    if (Gatherer.config.get("workflow.mirror", true) || Gatherer.config.get("workflow.mirror", false)) {
         /* @todo - add to dictionary */
-        return new FileNode(Utility.getCacheDir(), "Mirror Cache");
+        return new FileNode(Utility.getCacheDir(), "Mirroring.Mirror_Cache");
     }
     return null;
@@ -235 +276 @@
     }
 
+    private class DownloadButtonEnabler
+    implements DocumentListener {
+    /** Gives notification that an attribute or set of attributes changed. */
+    public void changedUpdate(DocumentEvent e) {
+        validateDownloadButton();
+    }
+        /** Gives notification that there was an insert into the document. */
+    public void insertUpdate(DocumentEvent e) {
+        validateDownloadButton();
+    }
+        /** Gives notification that a portion of the document has been removed. */
+    public void removeUpdate(DocumentEvent e) {
+        validateDownloadButton();
+    } 
+    private void validateDownloadButton() {
+        download_button.setEnabled(download_button_enabled && !url_field.isEmpty() && url_field.validateURL());
+    }
+    }
+
     private class DownloadButtonListener
     implements ActionListener {
@@ -240 +300 @@
     public void actionPerformed(ActionEvent event) {
         // Retrieve the current url and confirm it is valid
-        String url_str = url_textfield.getText();
+        String url_str = url_field.getText();
         URL url = null;
         try {
@@ -273 +333 @@
         catch(Exception exception) {
             /* @todo - add to dictionary */
-            JOptionPane.showMessageDialog(Gatherer.g_man, "The depth value you have entered is not valid.\nPlease choose an item from the list, or type in\na number.", "Invalid Depth", JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(Gatherer.g_man, "Mirroring.Mirror_Depth.Invalid_Depth", "Mirroring.Mirror_Depth.Invalid_Depth_Title", JOptionPane.ERROR_MESSAGE);
             return;
         }

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

@@ -49 +49 @@
     public ModalDialog() {
     super((Frame)null, "", false);
-    Gatherer.current_modal = this;
     }
 
@@ -57 +56 @@
     public ModalDialog(Dialog parent) {
     super(parent, "", false);
-    Gatherer.current_modal = this;
     }
 
@@ -67 +65 @@
     super(parent, "", false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
     
@@ -77 +74 @@
     super (parent, title, false);
     this.modal = false;
-    Gatherer.current_modal = this;
     }
 
@@ -88 +84 @@
     super (parent, title, false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
 
@@ -96 +91 @@
     public ModalDialog(Frame parent) {
     super(parent, "", false);
-    Gatherer.current_modal = this;
     }
 
@@ -106 +100 @@
     super(parent, "", false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
     
@@ -115 +108 @@
     public ModalDialog(Frame parent, String title) {
     super (parent, title, false);
-    Gatherer.current_modal = this;
     }
 
@@ -126 +118 @@
     super (parent, title, false);
     this.modal = modal;
-    Gatherer.current_modal = this;
     }
 
     public void dispose() {
-    Gatherer.current_modal = null;
     super.dispose();
+    }
+
+    /** Ensures the current dialog is visible. */
+    public void makeVisible() {
+    super.setVisible(true);
     }
 
@@ -142 +137 @@
     super.setVisible (visible);
     if (modal && visible) {
+        Gatherer.current_modal = this;
         try {
         if (SwingUtilities.isEventDispatchThread ()) {
@@ -180 +176 @@
     }
     else if(modal && !visible && waiting) {
+        Gatherer.current_modal = null;
         ///ystem.err.println("Hiding dialog. Tree lock is: " + getTreeLock());
         synchronized(getTreeLock()) {
@@ -187 +184 @@
     }
     else if(modal && !waiting) {
+        Gatherer.current_modal = null;
         ///ystem.err.println("Modal Dialog is not currently waiting.");
     }

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

@@ -48 +48 @@
     static public boolean titleClashes(String title, File current_config_file) {
     // An empty collection title never clashes with anything. I may look ugly in the final collection but there is nothing wrong with having no title for a particular language.
-    if(title == null || title.length() == 0) {
-        return false;
-    }
+    //if(title == null || title.length() == 0) {
+    //    return false;
+    //}
     File collection_directory = new File(Utility.getCollectionDir(Gatherer.config.gsdl_path));
     File children[] = collection_directory.listFiles();

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

@@ -118 +118 @@
      * @see org.greenstone.gatherer.collection.BuildOptions#getBuildValue
      * @see org.greenstone.gatherer.collection.BuildOptions#getBuildValueEnabled
-     * @see org.greenstone.gatherer.gui.OptionsPane#ArgumentControl
+     * @see org.greenstone.gatherer.gui.OptionsPane.ArgumentControl
      */
     public JPanel buildBuild(JPanel pane) {
@@ -178 +178 @@
      * @see org.greenstone.gatherer.collection.BuildOptions#getImportValue
      * @see org.greenstone.gatherer.collection.BuildOptions#getImportValueEnabled
-     * @see org.greenstone.gatherer.gui.OptionsPane#ArgumentControl
+     * @see org.greenstone.gatherer.gui.OptionsPane.ArgumentControl
      */
     public JPanel buildImport(JPanel pane) {

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

@@ -56 +56 @@
     private JButton apply_button;
     private JButton cancel_button;
+    private JButton clear_cache_button;
     private JButton ok_button;
     private JCheckBox show_file_size_checkbox;
@@ -208 +209 @@
     Dictionary.registerTooltip(proxy_port_field, "Preferences.Connection.Proxy_Port_Tooltip");
 
+    /** @todo - add to dictionary. Bet you're getting sick of these by now! */
+    clear_cache_button = new GLIButton("Preferences.Connection.Clear_Cache");
+
     // Connection
     use_proxy_checkbox.addActionListener(new UseProxyListener());
+    clear_cache_button.addActionListener(new ClearCacheListener());
 
     // Layout
@@ -235 +240 @@
     connection_pane.add(proxy_host_pane);
     connection_pane.add(proxy_port_pane);
+    if(Gatherer.config.get(StaticStrings.WORKFLOW_MIRROR, true)) {
+        connection_pane.add(clear_cache_button);
+    }
 
     return connection_pane;
@@ -717 +725 @@
     }
 
+    private class ClearCacheListener
+    implements ActionListener {
+    public void actionPerformed(ActionEvent event) {
+        // Retrieve the cache folder and delete it.
+        Utility.delete(Utility.getCacheDir());
+    }
+    }
+
     private class DictionaryEntry
     implements Comparable {

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

@@ -11 +11 @@
     implements DocumentListener {
 
-    static final public Pattern URL_PATTERN = Pattern.compile("h|ht|htt|http|http:|http:/|http://|http://(([a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*(\\.[a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*)|(([0-9])+\\.([0-9])+\\.([0-9])+\\.([0-9])+))(:([0-9])+)?(/([a-zA-Z]|[0-9]|[\\$\\-_\\.\\&\\+]|[!\\*\"\'\\(\\),]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*");
+    //static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?(([a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*(\\.[a-zA-Z]([a-zA-Z]|[0-9]|[\\$\\-_\\&\\+]|[!\\*\"\'\\(\\)]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*)|(([0-9])+\\.([0-9])+\\.([0-9])+\\.([0-9])+))(:([0-9])+)?(/([a-zA-Z]|[0-9]|[\\$\\-_\\.\\&\\+]|[!\\*\"\'\\(\\),]|(%[0-9A-Fa-f][0-9A-Fa-f]))*)*");
+
+    // Crap RegEx that matches everything dammit
+    //static final public Pattern URL_PATTERN = Pattern.compile("((.*?)://)?(([^:]*):([^@]*)@)?(([^/:]*)(:[^/]*))?([^\\?#]*/?)?(\\?([^?#]*))?(#(.*))?");
+
+    //static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[a-zA-Z0-9-]*(\.[a-zA-Z0-9-])*");
+
+    static final public Pattern URL_PATTERN = Pattern.compile("(h|ht|htt|http|http:|http:/|http://|http://)?[\\w]+(\\.[\\w]+)([\\w\\-\\.,@?^=%&:/~\\+#]*[\\w\\-\\@?^=%&/~\\+#])?");
 
     private Color background;
@@ -52 +59 @@
     validateURL();
     }
+
+    public boolean isEmpty() {
+    return (this.getText().length() == 0);
+    }
           
     /** Gives notification that a portion of the document has been removed. 

trunk/gli/src/org/greenstone/gatherer/msm/MSMUtils.java

@@ -327 +327 @@
      * @param element the Element whose attributes we wish to catalog
      * @return a TreeSet of the attributes sorted by their natural ordering
-     * @see org.greenstone.gatherer.msm.MSMUtils#getValue(Element)
+     * @see org.greenstone.gatherer.msm.MSMUtils#getValue(Node)
      * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
      * @see org.greenstone.gatherer.util.StaticStrings#CODE_ATTRIBUTE
@@ -817 +817 @@
      * @return true if the desired attribute was successfully found and removed, false otherwise
      * @see org.greenstone.gatherer.msm.MSMUtils#isAttributeLanguageDependant
-     * @see org.greenstone.gatherer.msm.MSMUtils#getValue(Element)
+     * @see org.greenstone.gatherer.msm.MSMUtils#getValue(Node)
      * @see org.greenstone.gatherer.util.StaticStrings#ATTRIBUTE_ELEMENT
      * @see org.greenstone.gatherer.util.StaticStrings#CODE_ATTRIBUTE

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

@@ -895 +895 @@
     }
 
-    /** Listens for actions on the read button, and if detected creates a new ReadTask to test the document. */
+    /** Listens for actions on the read button, and if detected creates a new ReadTask to test the document. 
+     * @author John Thompson, Greenstone Project, New Zealand Digital Library, University of Waikato
+     * @version 2.41 final
+     */
     static private class ReadButtonListener
     implements ActionListener {
@@ -918 +921 @@
     }
 
-    /** This threaded task opens a large document, aptly named 'big.txt', and then bombards the document object we are testing with lines from the file. This file should be several megs (such as Alice or TREC) to fully test functionality, thread conditions etc. */ 
+    /** This threaded task opens a large document, aptly named 'big.txt', and then bombards the document object we are testing with lines from the file. This file should be several megs (such as Alice or TREC) to fully test functionality, thread conditions etc. 
+     * @author John Thompson, Greenstone Project, New Zealand Digital Library, University of Waikato
+     * @version 2.41 final
+     */ 
     static private class ReadTask
     extends Thread {

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

@@ -140 +140 @@
     static final public String LANGUAGE_DEFAULT_STR                       = "defaultlanguage";
     static final public String LANGUAGE_STR                               = "language";
-    static final public String LANGUAGEDEPENDANT_ATTRIBUTE                = "language_dependant";
+    static final public String LANGUAGEDEPENDANT_ATTRIBUTE                = "language_dependent";
     static final public String LANGUAGES_ELEMENT                          = "Languages";
     static final public String LANGUAGES_STR                              = "languages";
@@ -167 +167 @@
     static final public String MGPP_ATTRIBUTE                             = "mgpp_enabled";
     static final public String MINUS_CHARACTER                            = "-";
+    static final public String MIRROR_ARGUMENT                            = "-mirror";
     static final public String MODE_STR                                   = "Mode: ";
     static final public String MODEGLI_ELEMENT                            = "ModeGLI";
@@ -175 +176 @@
     static final public String NEWLINE_ELEMENT                            = "NewLine";
     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                 = "(";
@@ -232 +234 @@
     static final public String VALUE_ATTRIBUTE                            = "value";
     static final public String VALUE_TREE_ATTRIBUTE                       = "remember_values";
-    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\"";
+    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\"";
+    static final public String WORKFLOW_MIRROR                            = "workflow.mirror";
     static final public String YES_STR                                    = "yes";
     static final public String ZERO_CHARACTER                             = "0";

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

@@ -42 +42 @@
     }
 
-    static final public Runnable insertNodeInto(final DefaultTreeModel model, final MutableTreeNode parent, final MutableTreeNode target_node, boolean wait_allowed) {
+    static final public Runnable insertNodeInto(final DefaultTreeModel model, final MutableTreeNode parent, final MutableTreeNode target_node, final boolean wait_allowed) {
     final Runnable doInsertNodeInto = new Runnable() {
         public void run() {
             ///ystem.err.print("Running task... ");
+            Gatherer.println("insertNodeInto(" + model + ", " + parent + ", " + target_node + ", " + wait_allowed);
             int index = -1;
             int pos = 0;