no redundant timeouts logs

[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 71de6fe..87c04bd 100644 (file)
--- 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.27 2007-03-15 11:38:14 mike Exp $
 
 # See the "Main" test package for documentation
 
@@ -11,12 +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 water", # Connector Framework only does 1016
               ### We can add more queries here
               );
 
@@ -38,15 +39,25 @@ sub completed_search {
     my($conn, $task, $udata, $event) = @_;
 
     my $n = $task->{rs}->size();
-    $conn->log("irspy_test", "Fetch test search (", $task->{query}, ") ",
+    $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 }, {},
@@ -101,7 +112,8 @@ sub record {
     my $ok = 0;
     if (!$record || $record->error()) {
        $conn->log("irspy_test", "retrieval of $syn record failed: ",
-                  defined $record ? $record->exception() : "???");
+                  defined $record ? $record->exception() :
+                                    $conn->exception());
     } else {
        $ok = 1;
        my $text = $record->render();