Changeset 17229

Timestamp:

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

Author:

ak19

Message:

Moved code for starting up (including opening connections) and quitting yaz-client into subroutines since the same code was repeated numerous times

File:

• gsdl/trunk/perllib/downloaders/Z3950Download.pm (modified) (6 diffs)

gsdl/trunk/perllib/downloaders/Z3950Download.pm

@@ -112 +112 @@
     print STDERR "<<Defined Maximum>>\n";
  
-    print STDERR "Opening connection to $url\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 "Access database: \"$self->{'database'}\"\n";
@@ -148 +133 @@
     $self->saveRecords($strRecords,$hashGeneralOptions->{'cache_dir'},$intMaxRecords);
     print STDERR "Closing connection...\n";
+
+    $self->quit_yaz();
+    return 1;
+}
+
+
+sub start_yaz 
+{
+    my ($self, $url) = @_;    
+
+    print STDERR "Opening connection to $url\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;
+
+    my $strOpen = $self->open_connection("open $url");  
+
+    if (!$strOpen) {
+        print STDERR "Cannot connect to $url\n"; 
+        print STDERR "<<Finished>>\n";  
+    return 0;
+    }
+    return $strOpen;
+}
+
+sub quit_yaz 
+{
+    my ($self) = shift (@_);
+
     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);
-    return 1;
+    close($self->{'YAZIN'}); # close the input to yaz. It also flushes quit command to yaz.
+
+    # make sure nothing is being output by yaz
+    my $output = $self->{'YAZOUT'};
+    my $line;
+    while (defined ($line = <$output>)) {
+    print STDERR "***### $line";
+    }
+
+    close($self->{'YAZOUT'});
 }
 
@@ -164 +189 @@
   my $out = $self->{'YAZOUT'}; 
 
-  $_ = <$out>;
+  my $opening_line = <$out>;
   
-  return (/Connecting...OK/i)? 1: 0; 
+  return ($opening_line =~ m/Connecting...OK/i)? 1: 0; 
  
 }
@@ -269 +294 @@
    my $readRecord = 0;
    
-   while (my $strLine = <YAZOUT>)
+   my $output = $self->{'YAZOUT'};
+   while (my $strLine = <$output>)
    {
    
@@ -344 +370 @@
    $url = $self->{'url'} unless defined $url;
 
-   my  $yaz =  $self->{'yaz'};
-   
-   my $childpid = open2(*YAZOUT, *YAZIN, $yaz)
-       or die "can't open pipe to yaz-client: $!";
-  
-   $self->{'YAZOUT'} = *YAZOUT;
-   $self->{'YAZIN'} = *YAZIN;
-
-   my $strOpen = $self->open_connection("open $url"); 
-   
-    if (!$strOpen) {
-        print STDERR "Cannot connect to $url\n"; 
-        print STDERR "<<Finished>>\n";  
-    return 0;
-    }
-
-   
+   my $strOpen = $self->start_yaz();
+
    $strOpen = $self->run_command_with_output("open $url","^Options");  
-
 
    $strOpen =~ s/Z> //g;
@@ -369 +379 @@
    print STDERR $strOpen; 
 
-   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 0;