X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=lib%2FZOOM%2FIRSpy%2FTest%2FRecord%2FFetch.pm;h=4d422002b4f33a2a1ecfa78ad33449a21342a9a5;hb=517b8f57b13544e010f3991d4d965c0926340292;hp=9d5f9c5d704dde9ebaa51352896d29dc007465b2;hpb=906007c54f392fd427b917e0d57df4d0a71bdfe6;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 9d5f9c5..4d42200 100644
--- a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@ -1,4 +1,3 @@
-# $Id: Fetch.pm,v 1.30 2009-04-15 13:57:38 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -11,13 +10,14 @@ use warnings;
 use ZOOM::IRSpy::Test;
 our @ISA = qw(ZOOM::IRSpy::Test);
 
+our $max_timeout_errors = $ZOOM::IRSpy::max_timeout_errors;
 
 # These queries 
 my @queries = (
 	       "\@attr 1=4 mineral",
 	       "\@attr 1=4 computer",
 	       "\@attr 1=44 mineral", # Smithsonian doesn't support AP 4!
-	       "\@attr 1=1016 mineral", # Connector Framework only does 1016
+	       "\@attr 1=1016 water", # Connector Framework only does 1016
 	       ### We can add more queries here
 	       );
 
@@ -42,12 +42,22 @@ sub completed_search {
     $conn->log("irspy_test", "Fetch test search (", $task->render_query(), ") ",
 	       ref $event && $event->isa("ZOOM::Exception") ?
 	       "failed: $event" : "found $n records (event=$event)");
+
+    # remember how often a target record hit a timeout
+    if (ref $event && $event->isa("ZOOM::Exception")) {
+	if ($event =~ /Timeout/i) {
+	    $conn->record->zoom_error->{TIMEOUT}++;
+            $conn->log("irspy_test", "Increase timeout error counter to: " . 
+		$conn->record->zoom_error->{TIMEOUT});
+        }
+    }
+
     if ($n == 0) {
 	$task->{rs}->destroy();
 	my $qindex = $udata->{queryindex}+1;
 	my $q = $queries[$qindex];
 	return ZOOM::IRSpy::Status::TEST_SKIPPED
-	    if !defined $q;
+	    if !defined $q || $conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors;
 
 	$conn->log("irspy_test", "Trying another search ...");
 	$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
@@ -66,7 +76,7 @@ sub completed_search {
                    'librismarc',
                    'mab',
                    'normarc',
-#                   'opac',
+                   'opac',
                    'picamarc',
                    'rusmarc',
                    'summary',