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=4628f14ac2dfac617a5c2b3ba8c53cfef063057e;hp=93bcd7af0ecdf2fbaf562ececbe4eec6a4170b1d;hb=9eaa3591a69586b241f756582839c9976a46c461;hpb=a8be7db5305925fc720f3dac7e6afc8fba7b9e60

diff --git a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
index 93bcd7a..4628f14 100644
--- a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
@@ -1,4 +1,4 @@
-# $Id: Bib1.pm,v 1.5 2006-10-06 11:33:08 mike Exp $
+# $Id: Bib1.pm,v 1.17 2007-02-28 17:32:48 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -15,32 +15,56 @@ 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",
-				ZOOM::Event::RECV_SEARCH, \&found,
+                                {'attr' => $attr}, {},
+				ZOOM::Event::ZEND, \&found,
 				exception => \&error);
     }
 }
 
 
 sub found {
-    my($conn, $task, $event) = @_;
-
+    my($conn, $task, $test_args, $event) = @_;
+    my $attr = $test_args->{'attr'};
     my $n = $task->{rs}->size();
-    $conn->log("irspy_test", "search found $n record", $n==1 ? "" : "s");
-    my $rec = $conn->record();
-    $rec->append_entry("irspy:status", "<irspy:search_title ok='1'>" .
-		       isodate(time()) . "</irspy:search_title>");
+
+    $conn->log("irspy_test", "search on access-point $attr found $n record",
+	       $n==1 ? "" : "s");
+    update($conn, $attr, 1);
+
+    return ZOOM::IRSpy::Status::TASK_DONE;
+}
+
+
+sub error {
+    my($conn, $task, $test_args, $exception) = @_;
+    my $attr = $test_args->{'attr'};
+
+    $conn->log("irspy_test", "search on access-point $attr had error: ",
+	       $exception);
+    update($conn, $attr, 0);
+
+    return ZOOM::IRSpy::Status::TEST_BAD
+	if ($exception->code() == 1 || # permanent system error
+	    $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;