Changeset 24386 for main/trunk

Timestamp:

2011-08-10T17:15:09+12:00 (13 years ago)

Author:

ak19

Message:

Undoing previous commit to Z3950: z3950 is not supposed to work like SRU protocol which Dr Bainbridge has found to be what the Library of Congress was returning (it was confusing because the yaz-client can communicate with servers implementing multiple protocols including Z3950 and SRU by issuing the same familiar commands).

File:

• main/trunk/greenstone2/perllib/downloaders/Z3950Download.pm (modified) (4 diffs)

main/trunk/greenstone2/perllib/downloaders/Z3950Download.pm

@@ -251 +251 @@
         $strShow = "show $intStartNumber+$intRecordsLeft";
         $intRecordsLeft = 0;
-        
-    }
+       
+           }
     
     $strResponse .= $self->get($strShow,$numRecords);
-
+         
     if ($strResponse eq ""){
         print STDERR "<<ERROR: failed to get $numRecords records>>\n";
@@ -276 +276 @@
     my $strFileName = $self->generateFileName($intMaxRecords);
 
-    $strOutputDir =~ s/"//g; #"
-
-    # remove any http:// prefix from the hostname to generate folder-name to store records in
-    my $foldername = $self->{'host'};
-    $foldername =~ s@^http:\/\/(.*)@$1@;
-
-    my $strOutputFile = &util::filename_cat($strOutputDir,$foldername,"$strFileName.marc");
+    $strOutputDir  =~ s/"//g; #"
+
+    my $strOutputFile = &util::filename_cat($strOutputDir,$self->{'host'},"$strFileName.marc");
      # prepare subdirectory for record (if needed)
     my ($strSubDirPath,$unused) = $self->dirFileSplit($strOutputFile);
@@ -320 +316 @@
    while (my $strLine = <$output>)
    {
+   
        if ($strLine =~ m/Records: ([\d]*)/i ){ 
        $readRecord = 1;
        next;  
-       } elsif ($strLine =~ m/<record/i){ # XML output such as from Library of Congress
-       $strFullOutput .= $strLine;
-       $readRecord = 1;
-       next;
        }
       
-       if ($strLine =~ m/\<\/record\>/i) { # end of XML, include the closing tag and then terminate below
-       $strFullOutput .= $strLine;
-       }
-
-      return $strFullOutput if ($strLine =~ m/nextResultSetPosition|Not connected|\<\/record\>/i);
+      return $strFullOutput if ($strLine =~ m/nextResultSetPosition|Not connected/i);
         
       next if(!$readRecord);
@@ -400 +389 @@
    $url = $self->{'url'} unless defined $url;
 
-   my $strOpen = $self->start_yaz($url);
-
-   $strOpen = $self->run_command_with_output("open $url","^Options|Connecting...OK.");  
+   my $strOpen = $self->start_yaz();
+
+   $strOpen = $self->run_command_with_output("open $url","^Options");  
 
    $strOpen =~ s/Z> //g;