Use Task::Search->render_query()

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy / Test / Record / Fetch.pm

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index 320f9ca..0569245 100644 (file)
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -1,4 +1,4 @@
-# $Id: Fetch.pm,v 1.26 2007-02-24 01:27:20 mike Exp $
+# $Id: Fetch.pm,v 1.28 2007-05-01 16:31:08 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -38,10 +38,11 @@ sub completed_search {
     my($conn, $task, $udata, $event) = @_;
 
     my $n = $task->{rs}->size();
-    $conn->log("irspy_test", "Fetch test search (", $task->{query}, ") ",
+    $conn->log("irspy_test", "Fetch test search (", $task->render_query(), ") ",
               ref $event && $event->isa("ZOOM::Exception") ?
               "failed: $event" : "found $n records (event=$event)");
     if ($n == 0) {
+       $task->{rs}->destroy();
        my $qindex = $udata->{queryindex}+1;
        my $q = $queries[$qindex];
        return ZOOM::IRSpy::Status::TEST_SKIPPED
@@ -116,6 +117,7 @@ sub record {
                                   'syntax'   => $syn,
                                   'ok'       => $ok);
 
+    $rs->destroy() if $udata->{last};
     return ($udata->{last} ?
            ZOOM::IRSpy::Status::TEST_GOOD :
            ZOOM::IRSpy::Status::TASK_DONE);
@@ -143,13 +145,14 @@ sub __UNUSED_search_error {
 
 
 sub fetch_error {
-    my($conn, $task, $test_args, $exception) = @_;
-    my $syn = $test_args->{'syntax'};
+    my($conn, $task, $udata, $exception) = @_;
+    my $syn = $udata->{'syntax'};
 
     $conn->log("irspy_test", "Retrieval of $syn record failed: ", $exception);
     $conn->record()->store_result('record_fetch',
                                   'syntax'       => $syn,
                                   'ok'        => 0);
+    $task->{rs}->destroy() if $udata->{last};
     return ZOOM::IRSpy::Status::TASK_DONE;
 }