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=1b1cfbc570aa6f760f1aac17dad356cb31b5ea8e;hb=9eaa3591a69586b241f756582839c9976a46c461;hpb=137f1b39b9d03be7681af968dc04c9a5dafacebe

diff --git a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
index 1b1cfbc..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.4 2006-10-02 13:02:10 sondberg Exp $
+# $Id: Bib1.pm,v 1.17 2007-02-28 17:32:48 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -7,70 +7,64 @@ package ZOOM::IRSpy::Test::Search::Bib1;
 use 5.008;
 use strict;
 use warnings;
-use Data::Dumper;
 
 use ZOOM::IRSpy::Test;
 our @ISA = qw(ZOOM::IRSpy::Test);
-our @Bib1_Attr = qw(1 2 3 4 5 6 7 8 9); 
 
 
-sub run {
-    my $this = shift();
-    my $irspy = $this->irspy();
-    my $pod = $irspy->pod();
-
-    $pod->callback(ZOOM::Event::RECV_SEARCH, \&found);
-    $pod->callback("exception", \&error_handler);
-    $pod->callback(ZOOM::Event::ZEND, \&continue);
-
-    foreach my $attr (@Bib1_Attr) {
-        $pod->search_pqf('@attr 1=' . $attr . ' water' );
-        $irspy->{'handle'}->{'attr'} = $attr;
-        my $err = $pod->wait($irspy);
+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
+                );
+
+    foreach my $attr (@attrs) {
+	$conn->irspy_search_pqf("\@attr 1=$attr mineral",
+                                {'attr' => $attr}, {},
+				ZOOM::Event::ZEND, \&found,
+				exception => \&error);
     }
-
-    return 0;
 }
 
 
 sub found {
-    my($conn, $irspy, $rs, $event) = @_;
-    my $href = $irspy->{'handle'};
-    my $attr = $href->{'attr'};
-    my $n = $rs->size();
-    my $rec = $irspy->record($conn);
-
-    $irspy->log("irspy_test", $conn->option("host"),
-		" Bib-1 attribute=$attr search found $n record",
-                $n==1 ? "" : "s");
-
-    $rec->append_entry("irspy:status", "<irspy:search set='bib1' attr='$attr'" .
-                       " ok='1'>" . $irspy->isodate(time()) .
-                       "</irspy:search>");
-    return 0;
-}
-
+    my($conn, $task, $test_args, $event) = @_;
+    my $attr = $test_args->{'attr'};
+    my $n = $task->{rs}->size();
 
-sub continue { 
-    my ($conn, $irspy, $rs, $event) = @_;
+    $conn->log("irspy_test", "search on access-point $attr found $n record",
+	       $n==1 ? "" : "s");
+    update($conn, $attr, 1);
 
-    print "ZEND\n";
+    return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
+sub error {
+    my($conn, $task, $test_args, $exception) = @_;
+    my $attr = $test_args->{'attr'};
 
-sub error_handler { maybe_connected(@_, 0) }
+    $conn->log("irspy_test", "search on access-point $attr had error: ",
+	       $exception);
+    update($conn, $attr, 0);
 
-sub maybe_connected {
-    my($conn, $irspy, $rs, $event, $ok) = @_;
+    return ZOOM::IRSpy::Status::TEST_BAD
+	if ($exception->code() == 1 || # permanent system error
+	    $exception->code() == 109); # Database unavailable
 
-    $irspy->log("irspy_test", $conn->option("host"),
-		($ok ? "" : " not"), " connected");
-    my $rec = $irspy->record($conn);
-    $rec->append_entry("irspy:status", "<irspy:probe ok='$ok'>" .
-		       $irspy->isodate(time()) . "</irspy:probe>");
-    $conn->option(pod_omit => 1) if !$ok;
-    return 0;
+    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;