X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=049e169420ba6ed31ee6387577cef6eefc955388;hb=dbfd510efb484cdf5ac9a2dae5f62f56a5ebcc0c;hp=c6b489fd9aecd30be61a23b23b0a54b6265d866d;hpb=f9fa0cec384029d5caafe4992c2a89704ef10632;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 c6b489f..049e169 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.16 2006-11-29 11:06:29 mike Exp $
+# $Id: Fetch.pm,v 1.19 2007-01-29 17:24:51 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -12,6 +12,15 @@ use ZOOM::IRSpy::Test;
 our @ISA = qw(ZOOM::IRSpy::Test);
 
 
+# These queries 
+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
+	       );
+
+
 sub start {
     my $class = shift();
     my($conn) = @_;
@@ -19,9 +28,9 @@ sub start {
     # Here I want to get a use attribute from the session, which we've
     # 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("\@attr 1=4 mineral", {}, {},	
+    $conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
 			    ZOOM::Event::RECV_SEARCH, \&completed_search,
-			    exception => \&error);
+			    exception => \&search_error);
 }
 
 
@@ -30,7 +39,19 @@ sub completed_search {
 
     my $n = $task->{rs}->size();
     $conn->log("irspy_test", "Fetch test search found $n records");
-    return ZOOM::IRSpy::Status::TEST_SKIPPED if $n == 0;
+    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 @syntax = (
                    'canmarc',
@@ -54,13 +75,15 @@ sub completed_search {
                    'xml'
                 );
     #@syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
-    foreach my $syntax (@syntax) {
+    foreach my $i (0 ..$#syntax) {
+	my $syntax = $syntax[$i];
 	$conn->irspy_rs_record($task->{rs}, 0,
-			       { syntax => $syntax },
+			       { syntax => $syntax,
+			         last => ($i == $#syntax) },
 			       { start => 0, count => 1,
 				 preferredRecordSyntax => $syntax },
                                 ZOOM::Event::RECV_RECORD, \&record,
-				exception => \&error);
+				exception => \&fetch_error);
     }
 
     return ZOOM::IRSpy::Status::TASK_DONE;
@@ -68,8 +91,8 @@ sub completed_search {
 
 
 sub record {
-    my($conn, $task, $test_args, $event) = @_;
-    my $syn = $test_args->{'syntax'};
+    my($conn, $task, $udata, $event) = @_;
+    my $syn = $udata->{'syntax'};
     my $rs = $task->{rs};
 
     my $record = _fetch_record($rs, 0, $syn);
@@ -92,7 +115,9 @@ sub record {
                                   'syntax'   => $syn,
                                   'ok'       => $ok);
 
-    return ZOOM::IRSpy::Status::TASK_DONE;
+    return ($udata->{last} ?
+	    ZOOM::IRSpy::Status::TEST_GOOD :
+	    ZOOM::IRSpy::Status::TASK_DONE);
 }
 
 
@@ -108,7 +133,15 @@ sub _fetch_record {
 }
 
 
-sub error {
+sub 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'};