Changeset 12465 for trunk/gsdl/perllib/downloaders/Z3950Download.pm

Timestamp:

2006-08-18T09:24:29+12:00 (18 years ago)

Author:

shaoqun

Message:

fixed th bugs on windows

File:

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

trunk/gsdl/perllib/downloaders/Z3950Download.pm

@@ -40 +40 @@
     @Z3950Download::ISA = ('BasDownload');
 }
-
-local (*YAZOUT, *YAZIN); 
 
 my $arguments = 
@@ -97 +95 @@
     # Must set $self->{'url'}, since GLI use $self->{'url'} to calculate the log file name!
     $self->{'url'} = $self->{'host'}.":".$self->{'port'};
+
+     my $os = $ENV{'GSDLOS'};
+
+    if ($os !~ /windows/) {
+    $self->{'yaz'} = "$ENV{'GSDLHOME'}/packages/yaz/yaz-2.1.4/client/yaz-client"; 
+    }
+    else{
+    $self->{'yaz'} = "$ENV{'GSDLHOME'}/bin/windows/yaz-client"; 
+    }
+    
     return bless $self, $class;
 
@@ -106 +114 @@
     my ($hashGeneralOptions) = @_;
     my ($strOpen,$strBase,$strFind,$strResponse,$intAmount,$intMaxRecords,$strRecords);
+
+    my $url = $self->{'url'};
+ 
     print STDERR "<<Defined Maximum>>\n";
  
-    my $url = $self->{'url'};
     print STDERR "Opening connection to $url\n";
      
-    my $childpid = open2(*YAZOUT, *YAZIN, "yaz-client")
-    or die "can't open pipe to yaz-client: $!";
- 
-    $strOpen = &run_command_with_output("open $url");  
+    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;
+    }
+
     print STDERR "Access database: \"$self->{'database'}\"\n";
-    &run_command_without_output("base $self->{'database'}");
+    $self->run_command_without_output("base $self->{'database'}");
     print STDERR "Searching for keyword: \"$self->{'find'}\"\n";
-    $intAmount = &findAmount($self->{'find'});
+    $intAmount = $self->findAmount($self->{'find'});
 
     if($intAmount <= 0)
     {
     ($intAmount == -1)? 
-        print STDERR "Unexpected format, Parsing operation can not be performed\n" : 
-        print STDERR "No Record is found\n";
+        print STDERR "Something wrong with the arguments,downloading can not be performed\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 = &getRecords($intMaxRecords);
-    print STDERR $strRecords;
-    &saveRecords($self,$strRecords,$hashGeneralOptions->{'cache_dir'},$intMaxRecords);
+    $strRecords = "Records: $intMaxRecords\n".$self->getRecords($intMaxRecords);
+   
+    $self->saveRecords($strRecords,$hashGeneralOptions->{'cache_dir'},$intMaxRecords);
     print STDERR "Closing connection...\n";
+    print STDERR "<<Finished>>\n";
+
     close(YAZOUT);
     close(YAZIN);
-    waitpid($childpid, 0);
     return 1;
 }
 
+sub open_connection{
+  my ($self,$strCommand) =  (@_);
+  
+  $self->run_command($strCommand);  
+
+  my $out = $self->{'YAZOUT'}; 
+
+  $_ = <$out>;
+  
+  return (/Connecting...OK/i)? 1: 0; 
+ 
+}
+
 sub findAmount
 {
+    my ($self) = shift (@_);
     my($strFindTarget) = @_;
-    my $strResponse = &run_command_with_output("find $strFindTarget");
-    return ($strResponse =~ m/^Number of hits: (\d+)/m)? $1:-1;    
+    my $strResponse = $self->run_command_with_output("find $strFindTarget","^Number of hits:");
+   return ($strResponse =~ m/^Number of hits: (\d+)/m)? $1:-1;    
 }
 
 sub getRecords
 {
+    my ($self) = shift (@_);
     my ($intMaxRecords) = @_;
-    my ($strShow,$intStartNumber,$strResponse,$strRecords,$intRecordsLeft);
+    my ($strShow,$intStartNumber,$numRecords,$strResponse,$strRecords,$intRecordsLeft);
 
     $intStartNumber = 1;
     $intRecordsLeft = $intMaxRecords;
+    $numRecords = 0;
+    $strResponse ="";
+
     while ($intRecordsLeft > 0)
     {
     if($intRecordsLeft > 50)
     {
-        print STDERR "<<Done:50>>\n";
+       
         print STDERR "Yaz is Gathering records: $intStartNumber - ".($intStartNumber+49)."\n";
-        
+        $numRecords = 50;
         $strShow = "show $intStartNumber+50";
         $intStartNumber = $intStartNumber + 50;
         $intRecordsLeft = $intRecordsLeft - 50;
+             
     }
     else
     {
-        print STDERR "<<Done:".($intRecordsLeft).">>\n";
+        $numRecords = $intRecordsLeft;
         print STDERR "Yaz is Gathering records: $intStartNumber - ".($intStartNumber+$intRecordsLeft-1)."\n";
         $strShow = "show $intStartNumber+$intRecordsLeft";
         $intRecordsLeft = 0;
+       
+           }
+    
+    $strResponse .= $self->get($strShow,$numRecords);
+         
+    if ($strResponse eq ""){
+        print STDERR "<<ERROR: failed to get $numRecords records>>\n";
     }
+    else{
+        print STDERR "<<Done:$numRecords>>\n";
+    }
+    }
+
+    return  "$strResponse\n";
     
-    $strResponse = &run_command_with_output($strShow);
-       
-    if($strResponse =~ m/Records: (\d*?)\n(.*?)nextResultSetPosition = (\d*?)\n/s)
-    {
-        $strRecords .= $2;
-    }
-    }
-    return $strRecords;
 }
 
@@ -188 +235 @@
     # setup directories
     # Currently only gather the MARC format
-    my $strFileName = &generateFileName($self,$intMaxRecords);
+    my $strFileName = $self->generateFileName($intMaxRecords);
+
+    $strOutputDir  =~ s/"//g;
+
     my $strFileURL = "$strOutputDir/$self->{'host'}/$strFileName.marc";
-    $strFileURL =~ s/:/\//g;
-
+  
     # prepare subdirectory for record (if needed)
-    my ($strSubDirPath,$unused) = dirFileSplit($strFileURL);
+    my ($strSubDirPath,$unused) = $self->dirFileSplit($strFileURL);
+ 
     &util::mk_all_dir($strSubDirPath);
 
     my $ds = &util::get_dirsep();
     my $strOutputFile = &util::filename_cat($strOutputDir,$self->{'host'},"$strFileName.marc");
-    $strOutputFile =~ s/:/$ds/g;
-
+   
     print STDERR "Saving records to \"$strOutputFile\"\n";
 
     # save record 
     open (ZOUT,">$strOutputFile")
-    || die "Unable to save oai metadata record: $!\n";
+    || die "Unable to save Z3950 record: $!\n";
     print ZOUT $strRecords;
     close(ZOUT);
 }
 
+
 sub run_command_with_output
 {
+    my ($self,$strCMD,$strStopRE) =@_;
+   
+    $self->run_command($strCMD); 
+   
+    return $self->get_output($strStopRE);
+ 
+}
+
+sub get{
+   my ($self,$strShow,$numRecord) = @_;  
+
+   $self->run_command($strShow);  
+   
+   my $strFullOutput="";
+   my $count=0;
+   my $readRecord = 0;
+   
+   while (my $strLine = <YAZOUT>)
+   {
+   
+       if ($strLine =~ m/Records: ([\d]*)/i ){ 
+       $readRecord = 1;
+       next;  
+       }
+      
+      return $strFullOutput if ($strLine =~ m/nextResultSetPosition|Not connected/i);
+        
+      next if(!$readRecord);
+      
+      $strFullOutput .= $strLine;     
+  }
+   
+}
+
+sub run_command_without_output
+{
+     my ($self) = shift (@_);
     my ($strCMD) = @_;
-    
-    return &run_command($strCMD,"^Elapsed:.*\$");
-}
-
-sub run_command_without_output
-{
-    my ($strCMD) = @_;
-
-    &run_command($strCMD);
+
+    $self->run_command($strCMD);
 }
 
 sub run_command
 {
-    my ($strCMD,$strStopRE) = @_;
-    
-  
-    print YAZIN "$strCMD\n";
+    my ($self,$strCMD) = @_; 
+ 
+    my $input = $self->{'YAZIN'};
+
+    print $input "$strCMD\n";  
+}
+
+sub get_output{
+    my ($self,$strStopRE) = @_;  
+
     if (!defined $strStopRE){return "";}
     else
     {
     my $strFullOutput;
-    while (my $strLine = <YAZOUT>)
+        my $output = $self->{'YAZOUT'};
+    while (my $strLine = <$output>)
     {
-        $strFullOutput .= $strLine;
-        if($strLine =~ m/$strStopRE/){return $strFullOutput;}
+           $strFullOutput .= $strLine;   
+       if($strLine =~ m/^$strStopRE|Not connected/i){return $strFullOutput;}
     }
     }
@@ -245 +332 @@
     my ($self,$intMaxRecords) = @_;
     my $strFileName = ($self->{'database'})."_".($self->{'find'})."_".($intMaxRecords);
+ 
 }
 
 sub dirFileSplit
 {
-    my ($strFile) = @_;
-
-    my @aryDirs = split("/",$strFile);
+    my ($self,$strFile) = @_;
+
+    my @aryDirs = split("[/\]",$strFile);
+   
     my $strLocalFile = pop(@aryDirs);
     my $strSubDirs = join("/",@aryDirs);
@@ -258 +347 @@
 }
 
+sub url_information
+{
+   my ($self,$url) = @_;
+
+   $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;
+    }
+
+   
+   $strOpen = $self->run_command_with_output("open $url","^Options");  
+
+
+   $strOpen =~ s/Z> //g;
+   $strOpen =~ s/Elapsed:.*//g;
+
+   print STDERR $strOpen; 
+
+   print STDERR "<<Finished>>\n"; 
+
+   close(YAZOUT);
+   close(YAZIN);
+
+   return 0;
+
+}
+
 sub error
 {
-    my ($strFunctionName,$strError) = @_;
+    my ($self,$strFunctionName,$strError) = @_;
     {
     print STDERR "Error occoured in Z3950Download.pm\n".