Changeset 17549 for gsdl/trunk

Timestamp:

2008-10-15T19:53:39+13:00 (16 years ago)

Author:

ak19

Message:

Changes to sudden wget download termination when OAIDownload.pm is used: OAIDownload.pm launches wget several times, one after another (after each previous wget instance has terminated). Therefore when the STOP signal is sent from GLI, the OAIDownload.pm script should stop altogether and issue no more calls to wget. This is now accomplished by checking the new member variable self->force_quit which is set to true when WgetDownload receives a STOP signal from GLI.

Location:

gsdl/trunk/perllib/downloaders

Files:

• OAIDownload.pm (modified) (5 diffs)
• WgetDownload.pm (modified) (5 diffs)

gsdl/trunk/perllib/downloaders/OAIDownload.pm

@@ -209 +209 @@
         return;  
     }
+    if ($self->{'forced_quit'}) {
+    return $strIDs;
+    }
 
     print STDERR "<<Download Information>>\n";
@@ -226 +229 @@
 
     $strIDs =  $self->useWget($cmdWget);
+    if ($self->{'forced_quit'}) {
+        return $accumulated_strIDs;
+    }
 
     $self->parse_xml($strIDs);
@@ -330 +336 @@
 
         my ($stdout_and_err2,$error2,$follow2) =  $self->useWgetMonitored($wget_cmd2);
+        return $strRecord if $self->{'forced_quit'};
 
         if($error2 ne "")
@@ -397 +404 @@
 
         my ($stdout_and_err,$errors,$follow) =  $self->useWgetMonitored($wget_cmd);
+        return $strRecord if $self->{'forced_quit'};
 
         if($errors ne "")
@@ -411 +419 @@
     if (!$had_valid_url)
     {
-        print  STDERR "\tNo souce document URL is specified in the OAI record (No (dc:)?identifier is provided)\n";
+        print  STDERR "\tNo source document URL is specified in the OAI record (No (dc:)?identifier is provided)\n";
     }
     }
     else
     {
-    print  STDERR "\tNo souce document URL is specified in the OAI record (No metadata field is provided)\n";
+    print  STDERR "\tNo source document URL is specified in the OAI record (No metadata field is provided)\n";
     }
 

gsdl/trunk/perllib/downloaders/WgetDownload.pm

@@ -96 +96 @@
 sub abrupt_end_handler {
     my $termination_signal = shift (@_);
+
     if(defined $childpid) {
     close($chld_out);
@@ -275 +276 @@
         if($signal eq "<<STOP>>") {
             print $client "Perl received STOP signal (on port $port): stopping wget\n";
-            $loop = 0;
+            $loop = 0;                          # out of outer while loop
+            $self->{'forced_quit'} = 1;         # subclasses need to know we're quitting
             
             # Sometimes the wget process takes some time to start up. If the STOP signal
@@ -301 +303 @@
             }
             }
-            last; # we're done here
+            last;                               # out of foreach loop
         }
         }
@@ -423 +425 @@
         if($signal eq "<<STOP>>") {
             print $client "Perl received STOP signal (on port $port): stopping wget\n";
-            $loop = 0;
+            $loop = 0;                          # out of outer while loop
+            $self->{'forced_quit'} = 1;         # subclasses need to know we're quitting
             
             # Sometimes the wget process takes some time to start up. If the STOP signal
@@ -449 +452 @@
             }
             }
-            last; # we're done here
+            last;                               # out of foreach loop
         }
         }