Changeset 17531 for gsdl/trunk/perllib/downloaders/WgetDownload.pm

Timestamp:

2008-10-14T18:12:20+13:00 (16 years ago)

Author:

ak19

Message:

Now works with OAIDownload.pm for downloading over OAI. The variable port (the port at which this script's serversocket is to listen) is now made global to the file because OAIDownload.pm will call the subroutine usewget several times (launching a wget several times) per instance of this WgetDownload.pm script. This means that the port number needs to be stored for reuse as it will not be sent over and over again by GLI.

File:

• gsdl/trunk/perllib/downloaders/WgetDownload.pm (modified) (3 diffs)

gsdl/trunk/perllib/downloaders/WgetDownload.pm

@@ -82 +82 @@
 # up before ending the child process.
 my $childpid;
-my($chld_out, $chld_in);
+my ($chld_out, $chld_in);
 my ($serverSocket, $read_set);
+
+# The port this script's server socket will be listening on, to handle 
+# incoming signals from GLI to terminate wget. This is also file global, 
+# since OAIDownload.pm will make several calls on wget using the same 
+# instance of this script and we want to reuse whatever port GLI gave us.
+my $port; 
 
 # When this script is called from the command line, this handler will be called
@@ -202 +208 @@
     # Instead, when wget has to be terminated in the middle of execution, GLI will
     # connect to a serverSocket here to communicate when it's time to stop wget.
-    my $port;
-    if(defined $self->{'gli'} && $self->{'gli'}) {
+    if(defined $self->{'gli'} && $self->{'gli'} && !defined $port) {
 
     $port = <STDIN>; # gets a port on localhost that's not yet in use
@@ -235 +240 @@
     } 
     else { # wget finished, terminate naturally
-        print STDERR "\nPerl: open2 command, input stream closed. Wget terminated naturally.\n";
+        #print STDERR "\nPerl: open2 command, input stream closed. Wget terminated naturally.\n";
         close($chld_in);
         close($chld_out);