X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FDan1.pm;h=415c5aa7dddc363866de0d4186fd762a14fa6f31;hb=dbf1fadda290f6fa6d6e6539954667aad75639c9;hp=f435ba9c02212e7748e62595ca448a1ecfc9448a;hpb=afad23c81cfde1bf74c4582b987f9e256fdb89c4;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 f435ba9..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.1 2006-10-13 13:40:29 sondberg Exp $
 
 # See the "Main" test package for documentation
 
@@ -20,8 +19,8 @@ sub start {
 
     foreach my $attr (@attrs) {
 	$conn->irspy_search_pqf("\@attr dan1 1=$attr mineral",
-                                {'attr' => $attr},
-				ZOOM::Event::RECV_SEARCH, \&found,
+                                {'attr' => $attr}, {},
+				ZOOM::Event::ZEND, \&found,
 				exception => \&error);
     }
 }
@@ -30,14 +29,12 @@ 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");
-    $conn->record()->append_entry("irspy:status",
-				  "<irspy:search set='dan1' ap='$attr' ok='1'>".
-				  isodate(time()) .
-				  "</irspy:search>");
+    update($conn, $attr, 1);
 
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
@@ -47,14 +44,26 @@ 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);
-    $conn->record()->append_entry("irspy:status",
-				  "<irspy:search set='dan1' ap='$attr' ok='0'>".
-				  isodate(time()) .
-				  "</irspy:search>");
+    update($conn, $attr, 0);
+    zoom_error_timeout_update($conn, $exception);
+
+    ### How about TEST_BAD if $exception->code() == 121?
     return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
+sub update {
+    my ($conn, $attr, $ok) = @_;
+
+    $conn->record()->store_result('search', 'set'       => 'dan-1',
+                                            'ap'        => $attr,
+                                            'ok'        => $ok);
+}
+
+
+
+
 1;