-# $Id: Fetch.pm,v 1.16 2006-11-29 11:06:29 mike Exp $
+# $Id: Fetch.pm,v 1.31 2009-04-21 13:42:58 mike Exp $
# See the "Main" test package for documentation
our @ISA = qw(ZOOM::IRSpy::Test);
+# 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
+ );
+
+
sub start {
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("\@attr 1=4 mineral", {}, {},
- ZOOM::Event::RECV_SEARCH, \&completed_search,
- exception => \&error);
+ $conn->irspy_search_pqf($queries[0], { queryindex => 0 }, {},
+ 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");
- return ZOOM::IRSpy::Status::TEST_SKIPPED if $n == 0;
+ $conn->log("irspy_test", "Fetch test search (", $task->render_query(), ") ",
+ ref $event && $event->isa("ZOOM::Exception") ?
+ "failed: $event" : "found $n records (event=$event)");
+ 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 }, {},
+ ZOOM::Event::ZEND, \&completed_search,
+ exception => \&completed_search);
+ return ZOOM::IRSpy::Status::TASK_DONE;
+ }
my @syntax = (
'canmarc',
'librismarc',
'mab',
'normarc',
- 'opac',
+# 'opac',
'picamarc',
'rusmarc',
'summary',
'xml'
);
#@syntax = qw(grs-1 sutrs usmarc xml); # simplify for debugging
- foreach my $syntax (@syntax) {
+ foreach my $i (0 ..$#syntax) {
+ my $syntax = $syntax[$i];
$conn->irspy_rs_record($task->{rs}, 0,
- { syntax => $syntax },
+ { syntax => $syntax,
+ last => ($i == $#syntax) },
{ start => 0, count => 1,
preferredRecordSyntax => $syntax },
- ZOOM::Event::RECV_RECORD, \&record,
- exception => \&error);
+ ZOOM::Event::ZEND, \&record,
+ exception => \&fetch_error);
}
return ZOOM::IRSpy::Status::TASK_DONE;
sub record {
- my($conn, $task, $test_args, $event) = @_;
- my $syn = $test_args->{'syntax'};
+ my($conn, $task, $udata, $event) = @_;
+ my $syn = $udata->{'syntax'};
my $rs = $task->{rs};
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);
- return ZOOM::IRSpy::Status::TASK_DONE;
+ $rs->destroy() if $udata->{last};
+ return ($udata->{last} ?
+ ZOOM::IRSpy::Status::TEST_GOOD :
+ ZOOM::IRSpy::Status::TASK_DONE);
}
}
-sub error {
+sub __UNUSED_search_error {
my($conn, $task, $test_args, $exception) = @_;
- my $syn = $test_args->{'syntax'};
+
+ $conn->log("irspy_test", "Initial search failed: ", $exception);
+ return ZOOM::IRSpy::Status::TEST_SKIPPED;
+}
+
+
+sub fetch_error {
+ 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;
}