X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=320f9cae545c52f8a6dbc0525026518f868bdd8c;hb=7399b69130004c102cc45d7812d284c61083b613;hp=d45524c538f8d01b3ef6fcdfab2954f1e1c39404;hpb=e505eb5744ec5928a4685cc3064ec80791ee021a;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index d45524c..320f9ca 100644
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -1,4 +1,4 @@
-# $Id: Fetch.pm,v 1.22 2007-02-13 15:04:08 mike Exp $
+# $Id: Fetch.pm,v 1.26 2007-02-24 01:27:20 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -29,7 +29,7 @@ sub start {
     # managed to search for in the Search/Bib1 or Search/Dan1 tests.
     # But how?  So far we search for title: 1=4
     $conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
-			    ZOOM::Event::RECV_SEARCH, \&completed_search,
+			    ZOOM::Event::ZEND, \&completed_search,
 			    exception => \&completed_search);
 }
 
@@ -38,7 +38,9 @@ sub completed_search {
     my($conn, $task, $udata, $event) = @_;
 
     my $n = $task->{rs}->size();
-    $conn->log("irspy_test", "Fetch test search found $n records");
+    $conn->log("irspy_test", "Fetch test search (", $task->{query}, ") ",
+	       ref $event && $event->isa("ZOOM::Exception") ?
+	       "failed: $event" : "found $n records (event=$event)");
     if ($n == 0) {
 	my $qindex = $udata->{queryindex}+1;
 	my $q = $queries[$qindex];
@@ -46,8 +48,8 @@ sub completed_search {
 	    if !defined $q;
 
 	$conn->log("irspy_test", "Trying another search ...");
-	$conn->irspy_search_pqf($queries[$qindex], { queryindex => $n }, {},
-				ZOOM::Event::RECV_SEARCH, \&completed_search,
+	$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+				ZOOM::Event::ZEND, \&completed_search,
 				exception => \&completed_search);
 	return ZOOM::IRSpy::Status::TASK_DONE;
     }
@@ -81,7 +83,7 @@ sub completed_search {
 			         last => ($i == $#syntax) },
 			       { start => 0, count => 1,
 				 preferredRecordSyntax => $syntax },
-                                ZOOM::Event::RECV_RECORD, \&record,
+                                ZOOM::Event::ZEND, \&record,
 				exception => \&fetch_error);
     }
 
@@ -96,9 +98,9 @@ sub record {
 
     my $record = _fetch_record($rs, 0, $syn);
     my $ok = 0;
-    if ($record->error()) {
+    if (!$record || $record->error()) {
 	$conn->log("irspy_test", "retrieval of $syn record failed: ",
-		   $record->exception());
+		   defined $record ? $record->exception() : "???");
     } else {
 	$ok = 1;
 	my $text = $record->render();