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

diff --git a/lib/ZOOM/IRSpy/Test/Search/Dan1.pm b/lib/ZOOM/IRSpy/Test/Search/Dan1.pm
index 9e344e6..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.4 2006-10-26 10:24:20 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;
 }
 
@@ -55,7 +58,7 @@ sub error {
 sub update {
     my ($conn, $attr, $ok) = @_;
 
-    $conn->record()->store_result('search', 'set'       => 'dan1',
+    $conn->record()->store_result('search', 'set'       => 'dan-1',
                                             'ap'        => $attr,
                                             'ok'        => $ok);
 }