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

diff --git a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
index bbeaeb3..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.7 2006-10-12 14:40:24 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -15,48 +14,60 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 sub start {
     my $class = shift();
     my($conn) = @_;
+    my @attrs = ( 1..63, 1000..1036,            # Bib-1
+                  1037..1096, 1185..1209,       # Extended Bib-1
+                  1097..1111,                   # Dublin-Core
+                  1112..1184                    # GILS
+                );
 
-    my @attrs = (1,		# personal name
-		 4,		# title
-		 52,		# subject
-		 1003,		# author
-		 1016,		# any
-		 );
     foreach my $attr (@attrs) {
-	$conn->irspy_search_pqf("\@attr 1=$attr mineral", $attr,
-				ZOOM::Event::RECV_SEARCH, \&found,
+	$conn->irspy_search_pqf("\@attr 1=$attr mineral",
+                                {'attr' => $attr}, {},
+				ZOOM::Event::ZEND, \&found,
 				exception => \&error);
     }
 }
 
 
 sub found {
-    my($conn, $task, $attr, $event) = @_;
+    my($conn, $task, $test_args, $event) = @_;
+    my $attr = $test_args->{'attr'};
 
     my $n = $task->{rs}->size();
+    $task->{rs}->destroy();
     $conn->log("irspy_test", "search on access-point $attr found $n record",
 	       $n==1 ? "" : "s");
-    ### Need to get the BIB-1 attribute into this callback
-    $conn->record()->append_entry("irspy:status",
-				  "<irspy:search_bib1 ap='$attr' ok='1'>" .
-				  isodate(time()) .
-				  "</irspy:search_bib1>");
+    update($conn, $attr, 1);
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
 sub error {
-    my($conn, $task, $attr, $exception) = @_;
+    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()->append_entry("irspy:status",
-				  "<irspy:search_bib1 ap='$attr' ok='0'>" .
-				  isodate(time()) .
-				  "</irspy:search_bib1>");
+    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;