X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FBib1.pm;h=1d5c0e785c6b682f05655b519217f2871dca5d7a;hp=fc1bf2caa0cffd8618fac57c2dc2feb8308760d8;hb=887ada2b0c58be15e4e0551fd0cee8672c9fbdb1;hpb=5550a26d54f5f5e65eb30f3f2b383f9836082dfb

diff --git a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
index fc1bf2c..1d5c0e7 100644
--- a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
@@ -1,4 +1,3 @@
-# $Id: Bib1.pm,v 1.12 2006-10-25 10:49:51 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -24,7 +23,7 @@ sub start {
     foreach my $attr (@attrs) {
 	$conn->irspy_search_pqf("\@attr 1=$attr mineral",
                                 {'attr' => $attr}, {},
-				ZOOM::Event::RECV_SEARCH, \&found,
+				ZOOM::Event::ZEND, \&found,
 				exception => \&error);
     }
 }
@@ -33,13 +32,12 @@ sub start {
 sub found {
     my($conn, $task, $test_args, $event) = @_;
     my $attr = $test_args->{'attr'};
-    my $n = $task->{rs}->size();
 
+    my $n = $task->{rs}->size();
+    $task->{rs}->destroy();
     $conn->log("irspy_test", "search on access-point $attr found $n record",
 	       $n==1 ? "" : "s");
-    $conn->record()->store_result('search', 'set'       => 'bib1',
-                                            'ap'        => $attr,
-                                            'ok'        => 1);
+    update($conn, $attr, 1);
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
@@ -49,13 +47,27 @@ sub error {
     my($conn, $task, $test_args, $exception) = @_;
     my $attr = $test_args->{'attr'};
 
+    $task->{rs}->destroy();
     $conn->log("irspy_test", "search on access-point $attr had error: ",
 	       $exception);
-    $conn->record()->store_result('search', 'set'       => 'bib1',
-                                            'ap'        => $attr,
-                                            'ok'        => 0);
+    update($conn, $attr, 0);
+    zoom_error_timeout_update($conn, $exception);
+
+# Commented out because TEST_BAD causes sibling tests to be skipped.
+#    return ZOOM::IRSpy::Status::TEST_BAD
+#	if ($exception->code() == 1 || # permanent system error
+#	    $exception->code() == 235 || # Database does not exist
+#	    $exception->code() == 109); # Database unavailable
+
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
+sub update {
+    my ($conn, $attr, $ok) = @_;
+    $conn->record()->store_result('search', 'set'       => 'bib-1',
+                                            'ap'        => $attr,
+                                            'ok'        => $ok);
+}
+
 1;