X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FDan1.pm;h=415c5aa7dddc363866de0d4186fd762a14fa6f31;hb=dbf1fadda290f6fa6d6e6539954667aad75639c9;hp=837a5e3e38fb1ea3856d4ab9d929b2276e4031f6;hpb=b507232a0932fa01ad0f47f3e19b8954afdf3a89;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Search/Dan1.pm b/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
index 837a5e3..415c5aa 100644
--- a/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
@@ -1,4 +1,3 @@
-# $Id: Dan1.pm,v 1.5 2006-10-27 09:56:07 sondberg Exp $
 
 # See the "Main" test package for documentation
 
@@ -21,7 +20,7 @@ sub start {
     foreach my $attr (@attrs) {
 	$conn->irspy_search_pqf("\@attr dan1 1=$attr mineral",
                                 {'attr' => $attr}, {},
-				ZOOM::Event::RECV_SEARCH, \&found,
+				ZOOM::Event::ZEND, \&found,
 				exception => \&error);
     }
 }
@@ -30,8 +29,9 @@ sub start {
 sub found {
     my($conn, $task, $test_args, $event) = @_;
     my $attr = $test_args->{'attr'};
-    my $n = $task->{rs}->size();
 
+    my $n = $task->{rs}->size();
+    $task->{rs}->destroy();
     $conn->log("irspy_test", "search on access-point $attr found $n record",
 	       $n==1 ? "" : "s");
     update($conn, $attr, 1);
@@ -44,10 +44,13 @@ sub error {
     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);
     update($conn, $attr, 0);
+    zoom_error_timeout_update($conn, $exception);
 
+    ### How about TEST_BAD if $exception->code() == 121?
     return ZOOM::IRSpy::Status::TASK_DONE;
 }