X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FSearch%2FTitle.pm;h=16d3a0640a87ffbdc04c3f7f6fd32caf1ce47cd0;hb=dbf1fadda290f6fa6d6e6539954667aad75639c9;hp=019d098c19af85603dcd3459a00271fd726e61d4;hpb=f873565f301b90012248fabe034b60ed51c78026;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Search/Title.pm b/lib/ZOOM/IRSpy/Test/Search/Title.pm
index 019d098..16d3a06 100644
--- a/lib/ZOOM/IRSpy/Test/Search/Title.pm
+++ b/lib/ZOOM/IRSpy/Test/Search/Title.pm
@@ -1,4 +1,3 @@
-# $Id: Title.pm,v 1.3 2006-07-24 17:02:51 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -9,34 +8,44 @@ use strict;
 use warnings;
 
 use ZOOM::IRSpy::Test;
-our @ISA;
-@ISA = qw(ZOOM::IRSpy::Test);
+our @ISA = qw(ZOOM::IRSpy::Test);
 
+use ZOOM::IRSpy::Utils qw(isodate);
 
-sub run {
-    my $this = shift();
-    my $irspy = $this->irspy();
-    my $pod = $irspy->pod();
 
-    $pod->callback(ZOOM::Event::RECV_SEARCH, \&found);
-    $pod->search_pqf('@attr 1=4 computer');
-    my $err = $pod->wait($irspy);
-    ### Should notice failure and log it.
+sub start {
+    my $class = shift();
+    my($conn) = @_;
 
-    return 0;
+    $conn->irspy_search_pqf('@attr 1=4 mineral', undef, {},
+			    ZOOM::Event::ZEND, \&found,
+			    "exception", \&error);
 }
 
 
 sub found {
-    my($conn, $irspy, $rs, $event) = @_;
+    my($conn, $task, $__UNUSED_udata, $event) = @_;
 
-    my $rec = $irspy->record($conn);
-    my $n = $rs->size();
-    $irspy->log("irspy_test", $conn->option("host"),
-		" title search found $n record", $n==1 ? "" : "s");
+    my $n = $task->{rs}->size();
+    $conn->log("irspy_test",
+	       "title search found $n record", $n==1 ? "" : "s");
+    my $rec = $conn->record();
     $rec->append_entry("irspy:status", "<irspy:search_title ok='1'>" .
-		       $irspy->isodate(time()) . "</irspy:search_title>");
-    return 0;
+		       isodate(time()) . "</irspy:search_title>");
+
+    return ZOOM::IRSpy::Status::TASK_DONE;
+}
+
+
+sub error {
+    my($conn, $task, $__UNUSED_udata, $exception) = @_;
+
+    $conn->log("irspy_test", "title search had error: $exception");
+    my $rec = $conn->record();
+    $rec->append_entry("irspy:status", "<irspy:search_title ok='0'>" .
+		       isodate(time()) . "</irspy:search_title>");
+    zoom_error_timeout_update($conn, $exception);
+    return ZOOM::IRSpy::Status::TEST_BAD;
 }