Changeset 22103

Timestamp:

2010-05-18T20:03:54+12:00 (14 years ago)

Author:

ak19

Message:

The Download Progress Pane used to say Download Complete almost immediately upon starting a download and while this was still in progress. This was a problem found with OAI download, but is now also fixed with the Web download mode. Tested with both.

Location:

main/trunk/gli/src/org/greenstone/gatherer/download

Files:

• DownloadJob.java (modified) (4 diffs)
• DownloadProgressBar.java (modified) (4 diffs)

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

@@ -387 +387 @@
                 // Add download
                 String new_url = line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
-                //addDownload("http:/" + new_url);
+                progress.addDownload("file"); //addDownload("http:/" + new_url.substring(cachedir_prefix_length()-1));              
             }
             }
@@ -415 +415 @@
             String new_url = 
                 line.substring(line.indexOf("`") + 1, line.lastIndexOf("'"));
-            //addDownload("http:/" + new_url);
+            progress.addDownload("file"); //addDownload("http:/" + new_url.substring(cachedir_prefix_length()-1));
             downloadWarning();
             }
@@ -435 +435 @@
             String total_ID = line.substring(line.indexOf(":") + 1, line.indexOf(">"));
             progress.setTotalDownload((Integer.valueOf(total_ID)).intValue());
-            progress.resetFileCount();
+            progress.resetFileCount();  
+            progress.addDownload("files"); // for display: "Downloading files"
             }
             else if (line.lastIndexOf("<<Done>>") != -1) {
@@ -456 +457 @@
         if(state == STOPPED) {
         boolean terminatePerlScript = true;
-        
+            
         // When GLI is working with wget-based download modes other than OAI (MediaWiki and Web 
         // download) and the STOP button has been pressed, wget needs to be prematurely terminated.

main/trunk/gli/src/org/greenstone/gatherer/download/DownloadProgressBar.java

@@ -296 +296 @@
     }   
 
-    /** Once a mirroring task is complete, is the DownloadJob returns from the
+    /** Once a mirroring task is complete, if the DownloadJob returns from the
      * native call but the status is still running, then this method
-     * is called to once again tinker with the pritty visual 
+     * is called to once again tinker with the pretty visual 
      * components.
      */
@@ -309 +309 @@
     progress.setValue(progress.getMaximum());
     progress.setString(Dictionary.get("Mirroring.DownloadJob.Download_Complete"));
+    current_status.setText(Dictionary.get("Mirroring.DownloadJob.Download_Complete")); 
+        // will display "Download Complete" once an OAI download session has finished running
 
     stop_start_button.setEnabled(false);
@@ -315 +317 @@
 
     /** When called this method updates the DownloadProgressBar to reflect
-     * the ammount of the current file downloaded.
+     * the amount of the current file downloaded.
      */
     public void updateProgress(long current, long expected) {
@@ -378 +380 @@
     }
     else {
-        current_status.setText(Dictionary.get("Mirroring.DownloadJob.Download_Complete"));
+        current_status.setText(Dictionary.get("Mirroring.DownloadJob.Download_Complete"));
     }