Comment out the test of the "opac" record syntax. I feel really

[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 f344ba5..d45524c 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.4 2006-10-25 10:19:33 mike Exp $
+# $Id: Fetch.pm,v 1.22 2007-02-13 15:04:08 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -12,9 +12,46 @@ 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) = @_;
+
+    # 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($queries[0], { queryindex => 0 }, {},
+                           ZOOM::Event::RECV_SEARCH, \&completed_search,
+                           exception => \&completed_search);
+}
+
+
+sub completed_search {
+    my($conn, $task, $udata, $event) = @_;
+
+    my $n = $task->{rs}->size();
+    $conn->log("irspy_test", "Fetch test search found $n records");
+    if ($n == 0) {
+       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 = (
                    'canmarc',
                    'danmarc',
@@ -25,7 +62,7 @@ sub start {
                    'librismarc',
                    'mab',
                    'normarc',
-                   'opac',
+#                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',
@@ -36,46 +73,78 @@ sub start {
                    'usmarc',
                    'xml'
                 );
-
-    foreach my $syn (@syntax) {
-        $conn->option('preferredRecordSyntax' => $syn);
-        $conn->option('start'   => 0);
-        $conn->option('count'   => 1);
-
-        ## 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",
-                                {'syntax' => $syn},
+    #@syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
+    foreach my $i (0 ..$#syntax) {
+       my $syntax = $syntax[$i];
+       $conn->irspy_rs_record($task->{rs}, 0,
+                              { 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;
 }
 
 
 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};
 
-    if (1) {
-        print STDERR $rs->record(0)->render();
+    my $record = _fetch_record($rs, 0, $syn);
+    my $ok = 0;
+    if ($record->error()) {
+       $conn->log("irspy_test", "retrieval of $syn record failed: ",
+                  $record->exception());
+    } else {
+       $ok = 1;
+       my $text = $record->render();
+       $conn->log("irspy_test", "Successfully retrieved a $syn record");
+       if (0) {
+           print STDERR "Hits: ", $rs->size(), "\n";
+           print STDERR "Syntax: ", $syn, "\n";
+           print STDERR $text;
+       }
     }
 
-    $conn->log("irspy_test", "Successfully retrieved a $syn record");
     $conn->record()->store_result('record_fetch',
                                   'syntax'   => $syn,
-                                  'ok'       => 1);
+                                  'ok'       => $ok);
 
-    return ZOOM::IRSpy::Status::TASK_DONE;
+    return ($udata->{last} ?
+           ZOOM::IRSpy::Status::TEST_GOOD :
+           ZOOM::IRSpy::Status::TASK_DONE);
+}
+
+
+sub _fetch_record {
+    my($rs, $index0, $syntax) = @_;
+
+    my $oldSyntax = $rs->option(preferredRecordSyntax => $syntax);
+    my $record = $rs->record(0);
+    $oldSyntax = "" if !defined $oldSyntax;
+    $rs->option(preferredRecordSyntax => $oldSyntax);
+
+    return $record;
+}
+
+
+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 error {
+sub fetch_error {
     my($conn, $task, $test_args, $exception) = @_;
     my $syn = $test_args->{'syntax'};
 
-    $conn->log("irspy_test", "Retrieval of $syn record failed:", $exception);
+    $conn->log("irspy_test", "Retrieval of $syn record failed: ", $exception);
     $conn->record()->store_result('record_fetch',
                                   'syntax'       => $syn,
                                   'ok'        => 0);