projects
/
irspy-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Task::Search->render_query()
[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
3142974
..
0569245
100644
(file)
--- a/
lib/ZOOM/IRSpy/Test/Record/Fetch.pm
+++ b/
lib/ZOOM/IRSpy/Test/Record/Fetch.pm
@@
-1,4
+1,4
@@
-# $Id: Fetch.pm,v 1.23 2007-02-13 16:49:14 mike Exp $
+# $Id: Fetch.pm,v 1.28 2007-05-01 16:31:08 mike Exp $
# See the "Main" test package for documentation
# See the "Main" test package for documentation
@@
-29,7
+29,7
@@
sub start {
# 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 }, {},
# 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);
}
exception => \&completed_search);
}
@@
-38,8
+38,11
@@
sub completed_search {
my($conn, $task, $udata, $event) = @_;
my $n = $task->{rs}->size();
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)");
if ($n == 0) {
if ($n == 0) {
+ $task->{rs}->destroy();
my $qindex = $udata->{queryindex}+1;
my $q = $queries[$qindex];
return ZOOM::IRSpy::Status::TEST_SKIPPED
my $qindex = $udata->{queryindex}+1;
my $q = $queries[$qindex];
return ZOOM::IRSpy::Status::TEST_SKIPPED
@@
-47,7
+50,7
@@
sub completed_search {
$conn->log("irspy_test", "Trying another search ...");
$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
$conn->log("irspy_test", "Trying another search ...");
$conn->irspy_search_pqf($queries[$qindex], { queryindex => $qindex }, {},
- ZOOM::Event::RECV_SEARCH, \&completed_search,
+ ZOOM::Event::ZEND, \&completed_search,
exception => \&completed_search);
return ZOOM::IRSpy::Status::TASK_DONE;
}
exception => \&completed_search);
return ZOOM::IRSpy::Status::TASK_DONE;
}
@@
-81,7
+84,7
@@
sub completed_search {
last => ($i == $#syntax) },
{ start => 0, count => 1,
preferredRecordSyntax => $syntax },
last => ($i == $#syntax) },
{ start => 0, count => 1,
preferredRecordSyntax => $syntax },
- ZOOM::Event::RECV_RECORD, \&record,
+ ZOOM::Event::ZEND, \&record,
exception => \&fetch_error);
}
exception => \&fetch_error);
}
@@
-96,9
+99,9
@@
sub record {
my $record = _fetch_record($rs, 0, $syn);
my $ok = 0;
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: ",
$conn->log("irspy_test", "retrieval of $syn record failed: ",
- $record->exception());
+ defined $record ? $record->exception() : "???");
} else {
$ok = 1;
my $text = $record->render();
} else {
$ok = 1;
my $text = $record->render();
@@
-114,6
+117,7
@@
sub record {
'syntax' => $syn,
'ok' => $ok);
'syntax' => $syn,
'ok' => $ok);
+ $rs->destroy() if $udata->{last};
return ($udata->{last} ?
ZOOM::IRSpy::Status::TEST_GOOD :
ZOOM::IRSpy::Status::TASK_DONE);
return ($udata->{last} ?
ZOOM::IRSpy::Status::TEST_GOOD :
ZOOM::IRSpy::Status::TASK_DONE);
@@
-141,13
+145,14
@@
sub __UNUSED_search_error {
sub fetch_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);
$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;
}
return ZOOM::IRSpy::Status::TASK_DONE;
}