From 137f1b39b9d03be7681af968dc04c9a5dafacebe Mon Sep 17 00:00:00 2001 From: "Anders S. Mortensen" Date: Mon, 2 Oct 2006 13:02:10 +0000 Subject: [PATCH] Added handlers for other types of ZOOM events so that the test case can run. --- lib/ZOOM/IRSpy/Test/Search/Bib1.pm | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/lib/ZOOM/IRSpy/Test/Search/Bib1.pm b/lib/ZOOM/IRSpy/Test/Search/Bib1.pm index f85a659..1b1cfbc 100644 --- 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.3 2006-10-02 07:40:53 sondberg Exp $ +# $Id: Bib1.pm,v 1.4 2006-10-02 13:02:10 sondberg Exp $ # See the "Main" test package for documentation @@ -20,11 +20,13 @@ sub run { my $pod = $irspy->pod(); $pod->callback(ZOOM::Event::RECV_SEARCH, \&found); + $pod->callback("exception", \&error_handler); + $pod->callback(ZOOM::Event::ZEND, \&continue); foreach my $attr (@Bib1_Attr) { $pod->search_pqf('@attr 1=' . $attr . ' water' ); $irspy->{'handle'}->{'attr'} = $attr; - my $err = $pod->wait({'irspy' => $irspy, 'attr' => $attr}); + my $err = $pod->wait($irspy); } return 0; @@ -32,8 +34,8 @@ sub run { sub found { - my($conn, $href, $rs, $event) = @_; - my $irspy = $href->{'irspy'}; + my($conn, $irspy, $rs, $event) = @_; + my $href = $irspy->{'handle'}; my $attr = $href->{'attr'}; my $n = $rs->size(); my $rec = $irspy->record($conn); @@ -49,4 +51,26 @@ sub found { } +sub continue { + my ($conn, $irspy, $rs, $event) = @_; + + print "ZEND\n"; +} + + + +sub error_handler { maybe_connected(@_, 0) } + +sub maybe_connected { + my($conn, $irspy, $rs, $event, $ok) = @_; + + $irspy->log("irspy_test", $conn->option("host"), + ($ok ? "" : " not"), " connected"); + my $rec = $irspy->record($conn); + $rec->append_entry("irspy:status", "" . + $irspy->isodate(time()) . ""); + $conn->option(pod_omit => 1) if !$ok; + return 0; +} + 1; -- 1.7.10.4