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
Fix result-set leak.
[irspy-moved-to-github.git]
/
lib
/
ZOOM
/
IRSpy
/
Test
/
Search
/
Bib1.pm
diff --git
a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm
index
bbeaeb3
..
4628f14
100644
(file)
--- a/
lib/ZOOM/IRSpy/Test/Search/Bib1.pm
+++ b/
lib/ZOOM/IRSpy/Test/Search/Bib1.pm
@@
-1,4
+1,4
@@
-# $Id: Bib1.pm,v 1.7 2006-10-12 14:40:24 mike Exp $
+# $Id: Bib1.pm,v 1.17 2007-02-28 17:32:48 mike Exp $
# See the "Main" test package for documentation
# See the "Main" test package for documentation
@@
-15,48
+15,56
@@
our @ISA = qw(ZOOM::IRSpy::Test);
sub start {
my $class = shift();
my($conn) = @_;
sub start {
my $class = shift();
my($conn) = @_;
+ my @attrs = ( 1..63, 1000..1036, # Bib-1
+ 1037..1096, 1185..1209, # Extended Bib-1
+ 1097..1111, # Dublin-Core
+ 1112..1184 # GILS
+ );
- my @attrs = (1, # personal name
- 4, # title
- 52, # subject
- 1003, # author
- 1016, # any
- );
foreach my $attr (@attrs) {
foreach my $attr (@attrs) {
- $conn->irspy_search_pqf("\@attr 1=$attr mineral", $attr,
- ZOOM::Event::RECV_SEARCH, \&found,
+ $conn->irspy_search_pqf("\@attr 1=$attr mineral",
+ {'attr' => $attr}, {},
+ ZOOM::Event::ZEND, \&found,
exception => \&error);
}
}
sub found {
exception => \&error);
}
}
sub found {
- my($conn, $task, $attr, $event) = @_;
-
+ my($conn, $task, $test_args, $event) = @_;
+ my $attr = $test_args->{'attr'};
my $n = $task->{rs}->size();
my $n = $task->{rs}->size();
+
$conn->log("irspy_test", "search on access-point $attr found $n record",
$n==1 ? "" : "s");
$conn->log("irspy_test", "search on access-point $attr found $n record",
$n==1 ? "" : "s");
- ### Need to get the BIB-1 attribute into this callback
- $conn->record()->append_entry("irspy:status",
- "<irspy:search_bib1 ap='$attr' ok='1'>" .
- isodate(time()) .
- "</irspy:search_bib1>");
+ update($conn, $attr, 1);
return ZOOM::IRSpy::Status::TASK_DONE;
}
sub error {
return ZOOM::IRSpy::Status::TASK_DONE;
}
sub error {
- my($conn, $task, $attr, $exception) = @_;
+ my($conn, $task, $test_args, $exception) = @_;
+ my $attr = $test_args->{'attr'};
$conn->log("irspy_test", "search on access-point $attr had error: ",
$exception);
$conn->log("irspy_test", "search on access-point $attr had error: ",
$exception);
- $conn->record()->append_entry("irspy:status",
- "<irspy:search_bib1 ap='$attr' ok='0'>" .
- isodate(time()) .
- "</irspy:search_bib1>");
+ update($conn, $attr, 0);
+
+ return ZOOM::IRSpy::Status::TEST_BAD
+ if ($exception->code() == 1 || # permanent system error
+ $exception->code() == 109); # Database unavailable
+
return ZOOM::IRSpy::Status::TASK_DONE;
}
return ZOOM::IRSpy::Status::TASK_DONE;
}
+sub update {
+ my ($conn, $attr, $ok) = @_;
+ $conn->record()->store_result('search', 'set' => 'bib-1',
+ 'ap' => $attr,
+ 'ok' => $ok);
+}
+
+
1;
1;