X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=c6b489fd9aecd30be61a23b23b0a54b6265d866d;hb=5c8ce99fc02ca60d412b70bb260c4a09ac5dd249;hp=2e0b591f372ccc97b5c6b1cdaac106b6eb91298a;hpb=6f3e46e6da867d23c86d7148751e4a7172e28df3;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 2e0b591..c6b489f 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.7 2006-10-25 15:44:50 mike Exp $
+# $Id: Fetch.pm,v 1.16 2006-11-29 11:06:29 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -28,7 +28,10 @@ sub start {
 sub completed_search {
     my($conn, $task, $udata, $event) = @_;
 
-    $conn->log("irspy_test", "Fetch test search succeeded");
+    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',
@@ -50,7 +53,7 @@ sub completed_search {
                    'usmarc',
                    'xml'
                 );
-    @syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
+    #@syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
     foreach my $syntax (@syntax) {
 	$conn->irspy_rs_record($task->{rs}, 0,
 			       { syntax => $syntax },
@@ -69,21 +72,42 @@ sub record {
     my $syn = $test_args->{'syntax'};
     my $rs = $task->{rs};
 
-    $conn->log("irspy_test", "Successfully retrieved a $syn record");
-    if (1) {
-        print STDERR "Hits: ", $rs->size(), "\n";
-        print STDERR "Syntax: ", $syn, "\n";
-        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->record()->store_result('record_fetch',
                                   'syntax'   => $syn,
-                                  'ok'       => 1);
+                                  'ok'       => $ok);
 
     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'};