X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=d3cb7bd2b5345f284fb2cb67bf625f90b712431b;hb=559de30617ade9804dd76a9ef8c3a9fc43b3fa89;hp=049e169420ba6ed31ee6387577cef6eefc955388;hpb=dbfd510efb484cdf5ac9a2dae5f62f56a5ebcc0c;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index 049e169..d3cb7bd 100644
--- 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.19 2007-01-29 17:24:51 mike Exp $
+# $Id: Fetch.pm,v 1.24 2007-02-22 17:45:43 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -30,7 +30,7 @@ sub start {
     # But how?  So far we search for title: 1=4
     $conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
 			    ZOOM::Event::RECV_SEARCH, \&completed_search,
-			    exception => \&search_error);
+			    exception => \&completed_search);
 }
 
 
@@ -38,19 +38,20 @@ 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 $n = $udata->{queryindex}+1;
-	my $q = $queries[$n];
-	if (defined $q) {
-	    $conn->log("irspy_test", "Trying another search ...");
-	    $conn->irspy_search_pqf($queries[$n], { queryindex => $n }, {},
-				    ZOOM::Event::RECV_SEARCH, \&completed_search,
-				    exception => \&search_error);
-	    return ZOOM::IRSpy::Status::TASK_DONE;
-	} else {
-	    return ZOOM::IRSpy::Status::TEST_SKIPPED;
-	}
+	my $qindex = $udata->{queryindex}+1;
+	my $q = $queries[$qindex];
+	return ZOOM::IRSpy::Status::TEST_SKIPPED
+	    if !defined $q;
+
+	$conn->log("irspy_test", "Trying another search ...");
+	$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+				ZOOM::Event::RECV_SEARCH, \&completed_search,
+				exception => \&completed_search);
+	return ZOOM::IRSpy::Status::TASK_DONE;
     }
 
     my @syntax = (
@@ -63,7 +64,7 @@ sub completed_search {
                    'librismarc',
                    'mab',
                    'normarc',
-                   'opac',
+#                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',
@@ -133,7 +134,7 @@ sub _fetch_record {
 }
 
 
-sub search_error {
+sub __UNUSED_search_error {
     my($conn, $task, $test_args, $exception) = @_;
 
     $conn->log("irspy_test", "Initial search failed: ", $exception);