Changeset 17230

Timestamp:

2008-09-09T19:15:00+12:00 (16 years ago)

Author:

ak19

Message:

SRWDownload now finally quits once it has finished. It's no longer running in the background as shown in the TaskManager. The changes necessary were in the get() subroutine which used to not read most of the last record previously, but now reads all of it. Additional changes required were sending the quit message to SRW (moved into the quit_yaz subroutine found in the superclass Z3950Download.pm) as well as flushing the yaz-client's outputstream (also done in the quit_yaz subroutine).

File:

• gsdl/trunk/perllib/downloaders/SRWDownload.pm (modified) (5 diffs)

gsdl/trunk/perllib/downloaders/SRWDownload.pm

@@ -78 +78 @@
     my ($strOpen,$strBase,$strFind,$strResponse,$intAmount,$intMaxRecords,$strRecords);
 
+    # If the url contains just the host and port (as it would for Z39.50), then prepend
+    # the http protocol. Otherwise the download is stuck in an infinite loop for SRW/SRU
+    $self->{'url'} = "http://$self->{'url'}"  if $self->{'url'} !~ m/^http/;
     my $url = $self->{'url'};
 
     print STDERR "<<Defined Maximum>>\n";
 
-    my  $yaz =  $self->{'yaz'}; 
-  
-    my $childpid = open2(*YAZOUT, *YAZIN, $yaz)
-    or (print STDERR "<<Finished>>\n" and die "can't open pipe to yaz-client: $!");
-
-    $self->{'YAZOUT'} = *YAZOUT;
-    $self->{'YAZIN'} = *YAZIN;
-
-    $strOpen = $self->open_connection("open $url"); 
-
-    if (!$strOpen) {
-        print STDERR "Cannot connect to $url\n"; 
-        print STDERR "<<Finished>>\n";  
-    return 0;
-    }
-
+    $strOpen = $self->start_yaz($url);
+    
     print STDERR "Opening connection to \"$self->{'url'}\"\n";
     print STDERR "Access database: \"$self->{'database'}\"\n";
@@ -103 +92 @@
     $self->run_command_without_output("querytype prefix");
     print STDERR "Searching for keyword: \"$self->{'find'}\"\n";
+
     $intAmount =$self->findAmount($self->{'find'});
 
@@ -109 +99 @@
     ($intAmount == -1)? 
         print STDERR "Something wrong with the arguments,downloading can not be performed\n" : 
-        print STDERR "No Record is found\n";
-        print STDERR "<<Finished>>\n";
+        print STDERR "No Record is found\n";
+    print STDERR "<<Finished>>\n";
     return 0;
     }
     $intMaxRecords = ($self->{'max_records'} > $intAmount)? $intAmount : $self->{'max_records'};
     print STDERR "<<Total number of record(s):$intMaxRecords>>\n";
-  
+   
     $strRecords = $self->getRecords($intMaxRecords);
-  
+
     $self->saveRecords($strRecords,$hashGeneralOptions->{'cache_dir'},$intMaxRecords);
     print STDERR "Closing connection...\n";
-    print STDERR "<<Finished>>\n";
-
-    # need to send the quit command, else yaz-client is still running in the background
-    $self->run_command_without_output("quit");
-    close(YAZOUT);
-    close(YAZIN);
+    
+    $self->quit_yaz();
     return 1;
 }
@@ -148 +134 @@
     &util::mk_all_dir($strSubDirPath);
 
-   print STDERR "Saving records to \"$strOutputFile\"\n";
+    print STDERR "Saving records to \"$strOutputFile\"\n";
 
     # save record 
@@ -157 +143 @@
 }
 
-sub get{
+sub get {
    my ($self,$strShow,$numRecord) = @_;  
 
-   $self->run_command($strShow);  
-   
+   $self->run_command_without_output($strShow); 
+
    my $strFullOutput="";
    my $count=0;
    my $readRecord = 0;
-   
-   while (my $strLine = <YAZOUT>)
+   my $endRecord = 0;
+
+   my $output = $self->{'YAZOUT'};
+   my $strLine;
+
+   while ($strLine = <$output>)    #while (defined ($strLine = <$output>)) 
    {
-    
-       return $strFullOutput if ($count >= $numRecord);
-
-       return $strFullOutput if($strLine =~ m/^HTTP ERROR/i);
-
-       if ($strLine =~ m/pos=[\d]*/i ){ 
+       last if ($count >= $numRecord && $endRecord); # done, if we've reached the end of the last record
+
+       last if($strLine =~ m/^HTTP ERROR/i);
+
+       if ($strLine =~ m/pos=[\d]*/i ) { 
            $count++;
        $readRecord = 1;
-       next;  
+       $endRecord = 0;
+       next;
        }
-      
+
+       if ($strLine =~ m/<\/record>/i ) { # end tag of record
+       $endRecord = 1;
+       }
+
        next if(!$readRecord);
 
        $strFullOutput .= $strLine;     
    }
- 
+
+   return $strFullOutput;
 }