-# $Id: Fetch.pm,v 1.20 2007-01-29 17:32:57 mike Exp $
# See the "Main" test package for documentation
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
);
my $class = shift();
my($conn) = @_;
- # Here I want to get a use attribute from the session, which we've
- # managed to search for in the Search/Bib1 or Search/Dan1 tests.
- # But how? So far we search for title: 1=4
$conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
- ZOOM::Event::RECV_SEARCH, \&completed_search,
+ ZOOM::Event::ZEND, \&completed_search,
exception => \&completed_search);
}
my($conn, $task, $udata, $event) = @_;
my $n = $task->{rs}->size();
- $conn->log("irspy_test", "Fetch test search found $n records");
+ $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) {
- my $n = $udata->{queryindex}+1;
- my $q = $queries[$n];
- if (defined $q) {
- $conn->log("irspy_test", "Trying another search ...");
- $conn->irspy_search_pqf($queries[$n], { queryindex => $n }, {},
- ZOOM::Event::RECV_SEARCH, \&completed_search,
- exception => \&completed_search);
- return ZOOM::IRSpy::Status::TASK_DONE;
- } else {
- return ZOOM::IRSpy::Status::TEST_SKIPPED;
- }
+ $task->{rs}->destroy();
+ my $qindex = $udata->{queryindex}+1;
+ my $q = $queries[$qindex];
+ return ZOOM::IRSpy::Status::TEST_SKIPPED
+ 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 }, {},
+ ZOOM::Event::ZEND, \&completed_search,
+ exception => \&completed_search);
+ return ZOOM::IRSpy::Status::TASK_DONE;
}
my @syntax = (
last => ($i == $#syntax) },
{ start => 0, count => 1,
preferredRecordSyntax => $syntax },
- ZOOM::Event::RECV_RECORD, \&record,
+ ZOOM::Event::ZEND, \&record,
exception => \&fetch_error);
}
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();
'syntax' => $syn,
'ok' => $ok);
+ $rs->destroy() if $udata->{last};
return ($udata->{last} ?
ZOOM::IRSpy::Status::TEST_GOOD :
ZOOM::IRSpy::Status::TASK_DONE);
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;
}