X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FBib1.pm;h=4f6048157bbb972b16dc809157c262036d7495c7;hb=5af22e3f1c66914ffebd391b78505c7f3ca5daf7;hp=56a43fba523ef55bc538ce7e15028813cafd1405;hpb=dc9bbb8ae09d481d587f5d9d7241b7aa68ad0746;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 56a43fb..4f60481 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.6 2006-10-11 16:47:23 mike Exp $
+# $Id: Bib1.pm,v 1.9 2006-10-13 10:03:31 sondberg Exp $
 
 # See the "Main" test package for documentation
 
@@ -8,6 +8,7 @@ use 5.008;
 use strict;
 use warnings;
 
+use Data::Dumper;
 use ZOOM::IRSpy::Test;
 our @ISA = qw(ZOOM::IRSpy::Test);
 
@@ -24,6 +25,7 @@ sub start {
 		 );
     foreach my $attr (@attrs) {
 	$conn->irspy_search_pqf("\@attr 1=$attr mineral",
+                                {'attr' => $attr},
 				ZOOM::Event::RECV_SEARCH, \&found,
 				exception => \&error);
     }
@@ -31,28 +33,31 @@ sub start {
 
 
 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");
-    ### Need to get the BIB-1 attribute into this callback
+
+    $conn->log("irspy_test", "search on access-point $attr found $n record",
+	       $n==1 ? "" : "s");
     $conn->record()->append_entry("irspy:status",
-				  "<irspy:search_bib1 ok='1'>" .
+				  "<irspy:search set='bib1' ap='$attr' ok='1'>".
 				  isodate(time()) .
-				  "</irspy:search_bib1>");
+				  "</irspy:search>");
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
 sub error {
-    my($conn, $task, $exception) = @_;
+    my($conn, $task, $test_args, $exception) = @_;
+    my $attr = $test_args->{'attr'};
 
-    $conn->log("irspy_test", "error: $exception");
+    $conn->log("irspy_test", "search on access-point $attr had error: ",
+	       $exception);
     $conn->record()->append_entry("irspy:status",
-				  "<irspy:search_bib1 ok='0'>" .
+				  "<irspy:search set='bib1' ap='$attr' ok='0'>".
 				  isodate(time()) .
-				  "</irspy:search_bib1>");
+				  "</irspy:search>");
     return ZOOM::IRSpy::Status::TASK_DONE;
 }