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=b6ff9b4a89a57251622972437e4ab1f9c337d25b;hp=fb21d18ef814101105fd1ae263cc8ac327273431;hb=1e23eeb797f1bbe48e3d3977d864a3d148b71597;hpb=4404b40258aa7c44a9126e56098f3b8459b69a96

diff --git a/lib/ZOOM/IRSpy/Test/Record/Fetch.pm b/lib/ZOOM/IRSpy/Test/Record/Fetch.pm
index fb21d18..b6ff9b4 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.25 2007-02-23 15:03:44 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,19 +39,34 @@ 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;
 
-	$conn->log("irspy_test", "Trying another search ...");
-	$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
+	if ($conn->record->zoom_error->{TIMEOUT} >= $max_timeout_errors) {
+	    $conn->log("irspy_test", "Got $max_timeout_errors timeouts, give up...");
+        } else {
+	    $conn->log("irspy_test", "Trying another search ...");
+	    $conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
 				ZOOM::Event::ZEND, \&completed_search,
 				exception => \&completed_search);
+	}
 	return ZOOM::IRSpy::Status::TASK_DONE;
     }
 
@@ -98,9 +114,10 @@ sub record {
 
     my $record = _fetch_record($rs, 0, $syn);
     my $ok = 0;
-    if ($record->error()) {
+    if (!$record || $record->error()) {
 	$conn->log("irspy_test", "retrieval of $syn record failed: ",
-		   $record->exception());
+		   defined $record ? $record->exception() :
+				     $conn->exception());
     } else {
 	$ok = 1;
 	my $text = $record->render();
@@ -116,6 +133,7 @@ sub record {
                                   'syntax'   => $syn,
                                   'ok'       => $ok);
 
+    $rs->destroy() if $udata->{last};
     return ($udata->{last} ?
 	    ZOOM::IRSpy::Status::TEST_GOOD :
 	    ZOOM::IRSpy::Status::TASK_DONE);
@@ -143,13 +161,14 @@ sub __UNUSED_search_error {
 
 
 sub fetch_error {
-    my($conn, $task, $test_args, $exception) = @_;
-    my $syn = $test_args->{'syntax'};
+    my($conn, $task, $udata, $exception) = @_;
+    my $syn = $udata->{'syntax'};
 
     $conn->log("irspy_test", "Retrieval of $syn record failed: ", $exception);
     $conn->record()->store_result('record_fetch',
                                   'syntax'       => $syn,
                                   'ok'        => 0);
+    $task->{rs}->destroy() if $udata->{last};
     return ZOOM::IRSpy::Status::TASK_DONE;
 }