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=c8a8fbd04ee33cdb951b95d95d16703dfc3ca4d4;hp=79e6fa2ac304d600170b51856c7a12eda94de778;hb=32f8933db25356a6d5c742530e70c7b4ae4f97e2;hpb=e9cefc21a4edfa91f2e1c618ba85643fff9cae78

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index 79e6fa2..c8a8fbd 100644
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -17,9 +17,42 @@ my @queries = (
 	       "\@attr 1=4 computer",
 	       "\@attr 1=44 mineral", # Smithsonian doesn't support AP 4!
 	       "\@attr 1=1016 water", # Connector Framework only does 1016
+	       "\@attr 1=1016 \@attr 2=103 x", # Find all records
 	       ### We can add more queries here
 	       );
 
+# Certain fetch attempts cause the connection to be lost (e.g. the
+# decoding of OPAC records fails for the National Library of
+# Education, Denmark (grundtvig.dpu.dk:2100/S), after which all
+# subsequent fetches fail -- see bug #3548.  To amerliorate the
+# consequences of this, we check the record syntaxes in order of
+# importance and likelihood of not causing the connection to be
+# dropped.  Of course, for well-behaved servers, this makes no
+# difference at all.
+
+#@syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
+my @syntax = (
+	       'usmarc',
+	       'canmarc',
+	       'danmarc',
+	       'ibermarc',
+	       'intermarc',
+	       'jpmarc',
+	       'librismarc',
+	       'mab',
+	       'normarc',
+	       'picamarc',
+	       'rusmarc',
+	       'swemarc',
+	       'ukmarc',
+	       'unimarc',
+	       'sutrs',
+	       'xml',
+	       'grs-1',
+	       'summary',
+	       'opac',
+	    );
+
 
 sub start {
     my $class = shift();
@@ -62,28 +95,6 @@ sub completed_search {
 	return ZOOM::IRSpy::Status::TASK_DONE;
     }
 
-    my @syntax = (
-                   'canmarc',
-                   'danmarc',
-                   'grs-1',
-                   'ibermarc',
-                   'intermarc',
-                   'jpmarc',
-                   'librismarc',
-                   'mab',
-                   'normarc',
-                   'opac',
-                   'picamarc',
-                   'rusmarc',
-                   'summary',
-                   'sutrs',
-                   'swemarc',
-                   'ukmarc',
-                   'unimarc',
-                   'usmarc',
-                   'xml'
-                );
-    #@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,
@@ -111,13 +122,18 @@ sub record {
 		   defined $record ? $record->exception() :
 				     $conn->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;
+	my $actual = $record->get("syntax");
+	if (lc($actual) ne lc($syn)) {
+	    $conn->log("irspy_test", "requested $syn record, but got $actual");
+	} else {
+	    $ok = 1;
+	    my $text = $record->render();
+	    $conn->log("irspy_test", "Successfully retrieved a $syn record ($actual)");
+	    if (0) {
+		print STDERR "Hits: ", $rs->size(), "\n";
+		print STDERR "Syntax: ", $syn, "\n";
+		print STDERR $text;
+	    }
 	}
     }