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=b63c22e99996b438bb0f64ac39b0e66f5b7446da;hp=754d3fa0908ad18605bd3feb33b403da1f708bb3;hb=e0a6655b970c68a4b7d3995957d9d917d315a847;hpb=d71c3e60cbfdc07844608b704f54234c370c104e

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index 754d3fa..b63c22e 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.6 2006-10-25 11:44:35 sondberg Exp $
+# $Id: Fetch.pm,v 1.15 2006-11-14 16:18:51 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -15,6 +15,23 @@ our @ISA = qw(ZOOM::IRSpy::Test);
 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("\@attr 1=4 mineral", {}, {},	
+			    ZOOM::Event::RECV_SEARCH, \&completed_search,
+			    exception => \&error);
+}
+
+
+sub completed_search {
+    my($conn, $task, $udata, $event) = @_;
+
+    my $n = $task->{rs}->size();
+    $conn->log("irspy_test", "Fetch test search found $n records");
+    return ZOOM::IRSpy::Status::TEST_SKIPPED if $n == 0;
+
     my @syntax = (
                    'canmarc',
                    'danmarc',
@@ -36,18 +53,17 @@ sub start {
                    'usmarc',
                    'xml'
                 );
-
-    foreach my $syn (@syntax) {
-        ## 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},
-				{ start => 0, count => 1,
-				  preferredRecordSyntax => $syn },
+    #@syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
+    foreach my $syntax (@syntax) {
+	$conn->irspy_rs_record($task->{rs}, 0,
+			       { syntax => $syntax },
+			       { start => 0, count => 1,
+				 preferredRecordSyntax => $syntax },
                                 ZOOM::Event::RECV_RECORD, \&record,
 				exception => \&error);
     }
+
+    return ZOOM::IRSpy::Status::TASK_DONE;
 }
 
 
@@ -56,21 +72,46 @@ sub record {
     my $syn = $test_args->{'syntax'};
     my $rs = $task->{rs};
 
-    if (1) {
-        print STDERR "Hits: ", $rs->size(), "\n";
-        print STDERR "Syntax: ", $syn, "\n";
-        print STDERR $rs->record(0)->render();
+    # Due to a bug in ZOOM-C (as of YAZ 2.1.38 of 31st October 2006),
+    # diagnostics in Present responses are not reported, so that we
+    # always end up in this callback rather than in error() where we
+    # should be.  Luckily, we can test whether the retrieval really
+    # did work by rendering the record, which will yield an undefined
+    # result if the fetch failed.
+    my $record = _fetch_record($rs, 0, $syn);
+    my $text = $record->render();
+    if (defined $text) {
+	$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;
+	}
+    } else {
+	$conn->log("irspy_test", "Retrieval of $syn record failed: ",
+		   "(exception unavailable)");
     }
 
-    $conn->log("irspy_test", "Successfully retrieved a $syn record");
     $conn->record()->store_result('record_fetch',
                                   'syntax'   => $syn,
-                                  'ok'       => 1);
+                                  'ok'       => defined $text ? 1 : 0);
 
     return 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 error {
     my($conn, $task, $test_args, $exception) = @_;
     my $syn = $test_args->{'syntax'};