X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FBib1.pm;h=56a43fba523ef55bc538ce7e15028813cafd1405;hb=86374b0502e33990e2ef9fd929395b435d084b6e;hp=1b1cfbc570aa6f760f1aac17dad356cb31b5ea8e;hpb=137f1b39b9d03be7681af968dc04c9a5dafacebe;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 1b1cfbc..56a43fb 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.6 2006-10-11 16:47:23 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -7,70 +7,54 @@ 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,		# 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,
+				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, $event) = @_;
 
+    my $n = $task->{rs}->size();
+    $conn->log("irspy_test", "search 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 ok='1'>" .
+				  isodate(time()) .
+				  "</irspy:search_bib1>");
 
-sub continue { 
-    my ($conn, $irspy, $rs, $event) = @_;
-
-    print "ZEND\n";
+    return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
+sub error {
+    my($conn, $task, $exception) = @_;
 
-sub error_handler { maybe_connected(@_, 0) }
-
-sub maybe_connected {
-    my($conn, $irspy, $rs, $event, $ok) = @_;
-
-    $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;
+    $conn->log("irspy_test", "error: $exception");
+    $conn->record()->append_entry("irspy:status",
+				  "<irspy:search_bib1 ok='0'>" .
+				  isodate(time()) .
+				  "</irspy:search_bib1>");
+    return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
+
 1;