X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=05692456342e6592860eedf1c300bb0234736ba8;hp=bd4c8c45679dd9e655ec529978fe46b060850d6c;hb=f09d2992d3d1d1620eb66c640b63b4387e4050e4;hpb=18c0310db8963cf138e1802d7405827c76685956

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index bd4c8c4..0569245 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.17 2006-12-08 11:57:51 mike Exp $
+# $Id: Fetch.pm,v 1.28 2007-05-01 16:31:08 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -16,6 +16,7 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 my @queries = (
 	       "\@attr 1=4 mineral",
 	       "\@attr 1=4 computer",
+	       "\@attr 1=44 mineral", # Smithsonian doesn't support AP 4!
 	       ### We can add more queries here
 	       );
 
@@ -28,8 +29,8 @@ 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,
-			    exception => \&error);
+			    ZOOM::Event::ZEND, \&completed_search,
+			    exception => \&completed_search);
 }
 
 
@@ -37,19 +38,21 @@ 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->render_query(), ") ",
+	       ref $event && $event->isa("ZOOM::Exception") ?
+	       "failed: $event" : "found $n records (event=$event)");
     if ($n == 0) {
-	my $n = $udata->{queryindex}+1;
-	my $q = $queries[$n];
-	if (defined $q) {
-	    $conn->log("irspy_test", "Trying another search ...");
-	    $conn->irspy_search_pqf($queries[$n], { queryindex => $n }, {},
-				    ZOOM::Event::RECV_SEARCH, \&completed_search,
-				    exception => \&error);
-	    return ZOOM::IRSpy::Status::TASK_DONE;
-	} else {
-	    return ZOOM::IRSpy::Status::TEST_SKIPPED;
-	}
+	$task->{rs}->destroy();
+	my $qindex = $udata->{queryindex}+1;
+	my $q = $queries[$qindex];
+	return ZOOM::IRSpy::Status::TEST_SKIPPED
+	    if !defined $q;
+
+	$conn->log("irspy_test", "Trying another search ...");
+	$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+				ZOOM::Event::ZEND, \&completed_search,
+				exception => \&completed_search);
+	return ZOOM::IRSpy::Status::TASK_DONE;
     }
 
     my @syntax = (
@@ -62,7 +65,7 @@ sub completed_search {
                    'librismarc',
                    'mab',
                    'normarc',
-                   'opac',
+#                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',
@@ -81,8 +84,8 @@ sub completed_search {
 			         last => ($i == $#syntax) },
 			       { start => 0, count => 1,
 				 preferredRecordSyntax => $syntax },
-                                ZOOM::Event::RECV_RECORD, \&record,
-				exception => \&error);
+                                ZOOM::Event::ZEND, \&record,
+				exception => \&fetch_error);
     }
 
     return ZOOM::IRSpy::Status::TASK_DONE;
@@ -96,9 +99,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();
@@ -114,6 +117,7 @@ sub record {
                                   'syntax'   => $syn,
                                   'ok'       => $ok);
 
+    $rs->destroy() if $udata->{last};
     return ($udata->{last} ?
 	    ZOOM::IRSpy::Status::TEST_GOOD :
 	    ZOOM::IRSpy::Status::TASK_DONE);
@@ -132,14 +136,23 @@ sub _fetch_record {
 }
 
 
-sub error {
+sub __UNUSED_search_error {
     my($conn, $task, $test_args, $exception) = @_;
-    my $syn = $test_args->{'syntax'};
+
+    $conn->log("irspy_test", "Initial search failed: ", $exception);
+    return ZOOM::IRSpy::Status::TEST_SKIPPED;
+}
+
+
+sub fetch_error {
+    my($conn, $task, $udata, $exception) = @_;
+    my $syn = $udata->{'syntax'};
 
     $conn->log("irspy_test", "Retrieval of $syn record failed: ", $exception);
     $conn->record()->store_result('record_fetch',
                                   'syntax'       => $syn,
                                   'ok'        => 0);
+    $task->{rs}->destroy() if $udata->{last};
     return ZOOM::IRSpy::Status::TASK_DONE;
 }