Use ZEND only for callbacks, rather than RECV_*

[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 53a0379..fb21d18 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.21 2007-02-13 14:35:04 mike Exp $
+# $Id: Fetch.pm,v 1.25 2007-02-23 15:03:44 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -29,7 +29,7 @@ sub start {
     # managed to search for in the Search/Bib1 or Search/Dan1 tests.
     # But how?  So far we search for title: 1=4
     $conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
-                           ZOOM::Event::RECV_SEARCH, \&completed_search,
+                           ZOOM::Event::ZEND, \&completed_search,
                            exception => \&completed_search);
 }
 
@@ -38,7 +38,9 @@ sub completed_search {
     my($conn, $task, $udata, $event) = @_;
 
     my $n = $task->{rs}->size();
-    $conn->log("irspy_test", "Fetch test search found $n records");
+    $conn->log("irspy_test", "Fetch test search (", $task->{query}, ") ",
+              ref $event && $event->isa("ZOOM::Exception") ?
+              "failed: $event" : "found $n records (event=$event)");
     if ($n == 0) {
        my $qindex = $udata->{queryindex}+1;
        my $q = $queries[$qindex];
@@ -46,8 +48,8 @@ sub completed_search {
            if !defined $q;
 
        $conn->log("irspy_test", "Trying another search ...");
-       $conn->irspy_search_pqf($queries[$qindex], { queryindex => $n }, {},
-                               ZOOM::Event::RECV_SEARCH, \&completed_search,
+       $conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+                               ZOOM::Event::ZEND, \&completed_search,
                                exception => \&completed_search);
        return ZOOM::IRSpy::Status::TASK_DONE;
     }
@@ -62,7 +64,7 @@ sub completed_search {
                    'librismarc',
                    'mab',
                    'normarc',
-                   'opac',
+#                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',
@@ -81,7 +83,7 @@ sub completed_search {
                                 last => ($i == $#syntax) },
                               { start => 0, count => 1,
                                 preferredRecordSyntax => $syntax },
-                                ZOOM::Event::RECV_RECORD, \&record,
+                                ZOOM::Event::ZEND, \&record,
                                exception => \&fetch_error);
     }