Changeset 17665 for gli

Timestamp:

2008-10-31T19:27:01+13:00 (15 years ago)

Author:

ak19

Message:

In the case of OAIDownloads, GLI and WgetDownload.pm no longer uses sockets for terminating wget. The original GS2 2.80 did a better job in terminating the multiple wgets launched, by just letting the Java code do a process.destroy() on the perl script which--although it would let the current wget download finish--would not launch further wget instances.

File:

• gli/trunk/src/org/greenstone/gatherer/download/DownloadJob.java (modified) (4 diffs)

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

@@ -230 +230 @@
 
     public void callDownload() {
-    
+
     ArrayList command_list = new ArrayList();
         if (Utility.isWindows()) {
@@ -305 +305 @@
 
         // To be able to stop Wget, we use sockets to communicate with the perl process that launched wget
-        if (!mode.equals("Z3950") && !mode.equals("SRW")) { // wget-based Download modes (OAI, MediaWiki and Web download)
+        if (mode.equals("Web") || mode.equals("MediaWiki")) { // wget download modes other than OAI
         
         // Need to find an available (unused) port within the range we're looking for to pass it
@@ -445 +445 @@
         }
         }
+
         if(state == STOPPED) {
         boolean terminatePerlScript = true;
-
-        // When GLI is working with wget-based download modes (OAI, MediaWiki and Web download)
-        // and the STOP button has been pressed, wget needs to be prematurely terminated.
-        // The presence of the tmpfile will indicate to the perl script that it's time to kill wget.
-        if(prcs != null && !mode.equals("Z3950") && !mode.equals("SRW")) { 
-            
+        
+        // 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.
+        // Only wget download modes Web and MediaWiki require the use of sockets to communicate
+        // with the perl script in order to get wget to terminate. Other download modes, including
+        // wgetdownload mode OAI, can terminate in the traditional manner: close process inputstream 
+        // and kill perl process. OAI launches many wgets. So that when the perl process is terminated,
+        // the currently running wget will finish off but other wgets are no longer launched. 
+        if(prcs != null && (mode.equals("Web") || mode.equals("MediaWiki"))) { 
+
             // create a socket to the perl child process and communicate the STOP message
             Socket clientSocket = null;
@@ -494 +499 @@
         //prcs.getInputStream().close();
         prcs.getErrorStream().close();
+        br.close();
+        br = null;
         if(terminatePerlScript) {
             prcs.destroy(); // This doesn't always work, but it's worth a try       
             prcs = null;
         }
-        br.close();
-        br = null;
 
         // Notify the DownloadScrollPane which is waiting on this job to complete that we are ready