X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=d45524c538f8d01b3ef6fcdfab2954f1e1c39404;hp=bd4c8c45679dd9e655ec529978fe46b060850d6c;hb=8e8489f6c6191b3335adb1f1b285d9c7ad724023;hpb=18c0310db8963cf138e1802d7405827c76685956

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index bd4c8c4..d45524c 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.17 2006-12-08 11:57:51 mike Exp $
+# $Id: Fetch.pm,v 1.22 2007-02-13 15:04:08 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -16,6 +16,7 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 my @queries = (
 	       "\@attr 1=4 mineral",
 	       "\@attr 1=4 computer",
+	       "\@attr 1=44 mineral", # Smithsonian doesn't support AP 4!
 	       ### We can add more queries here
 	       );
 
@@ -29,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 => \&error);
+			    exception => \&completed_search);
 }
 
 
@@ -39,17 +40,16 @@ sub completed_search {
     my $n = $task->{rs}->size();
     $conn->log("irspy_test", "Fetch test search found $n records");
     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 => \&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 => $n }, {},
+				ZOOM::Event::RECV_SEARCH, \&completed_search,
+				exception => \&completed_search);
+	return ZOOM::IRSpy::Status::TASK_DONE;
     }
 
     my @syntax = (
@@ -62,7 +62,7 @@ sub completed_search {
                    'librismarc',
                    'mab',
                    'normarc',
-                   'opac',
+#                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',
@@ -82,7 +82,7 @@ sub completed_search {
 			       { start => 0, count => 1,
 				 preferredRecordSyntax => $syntax },
                                 ZOOM::Event::RECV_RECORD, \&record,
-				exception => \&error);
+				exception => \&fetch_error);
     }
 
     return ZOOM::IRSpy::Status::TASK_DONE;
@@ -132,7 +132,15 @@ sub _fetch_record {
 }
 
 
-sub error {
+sub __UNUSED_search_error {
+    my($conn, $task, $test_args, $exception) = @_;
+
+    $conn->log("irspy_test", "Initial search failed: ", $exception);
+    return ZOOM::IRSpy::Status::TEST_SKIPPED;
+}
+
+
+sub fetch_error {
     my($conn, $task, $test_args, $exception) = @_;
     my $syn = $test_args->{'syntax'};