X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=a8f5d90e283ad00afd36a19473c94b1848c6b58c;hp=5e28956ad8c64e05c5e5769d2da3b31c6afb8064;hb=d104e0fcbd34a71d39ed68ac874ad2e7c34c3c23;hpb=95688f2c6952387b7fa26c9dd41687e0d5ac8c29 diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index 5e28956..a8f5d90 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,4 @@ -# $Id: IRSpy.pm,v 1.16 2006-09-20 16:12:56 mike Exp $ +# $Id: IRSpy.pm,v 1.21 2006-09-27 12:49:46 mike Exp $ package ZOOM::IRSpy; @@ -74,17 +74,17 @@ sub log { # sub targets { my $this = shift(); - my($targetList) = @_; + my(@targets) = @_; - $this->log("irspy", "setting explicit list of targets '$targetList'"); + $this->log("irspy", "setting explicit list of targets ", + join(", ", map { "'$_'" } @targets)); $this->{allrecords} = 0; - my @targets = grep { $_ ne "" } split /\s+/, $targetList; my @qlist; foreach my $target (@targets) { my($host, $port, $db, $newtarget) = _parse_target_string($target); if ($newtarget ne $target) { $this->log("irspy_debug", "rewriting '$target' to '$newtarget'"); - $target = $newtarget; # This written through the ref + $target = $newtarget; # This is written through the ref } push @qlist, (qq[(host = "$host" and port = "$port" and path="$db")]); @@ -158,7 +158,7 @@ sub initialise { my $zeerex = _render_record($rs, $i-1, "zeerex"); #print STDERR "making '$target' record with '$zeerex'\n"; $target2record{lc($target)} = - new ZOOM::IRSpy::Record($target, $zeerex); + new ZOOM::IRSpy::Record($this, $target, $zeerex); push @{ $this->{targets} }, $target if $this->{allrecords}; } @@ -168,7 +168,7 @@ sub initialise { if (!defined $record) { $this->log("irspy_debug", "made new record for '$target'"); #print STDERR "making '$target' record without zeerex\n"; - $target2record{$target} = new ZOOM::IRSpy::Record($target); + $target2record{$target} = new ZOOM::IRSpy::Record($this, $target); } else { $this->log("irspy_debug", "using existing record for '$target'"); } @@ -201,8 +201,10 @@ sub _render_record { # sub check { my $this = shift(); + my($test) = @_; - my $res = $this->_run_test("Main"); + $test = "Main" if !defined $test; + my $res = $this->_run_test($test); foreach my $target (sort keys %{ $this->{target2record} }) { my $rec = $this->{target2record}->{$target}; # Write record back to database @@ -249,7 +251,8 @@ sub _run_test { $this->log("irspy", "running test '$tname'"); push @{ $this->{tests} }, $tname; my $test = "ZOOM::IRSpy::Test::$tname"->new($this); - my $res =$test->run(); + my $res = $test->run(); + $this->pod()->remove_callbacks(); pop @{ $this->{tests} }; return $res; } @@ -288,7 +291,10 @@ sub isodate { =head1 SEE ALSO -ZOOM::IRSpy::Record +ZOOM::IRSpy::Record, +ZOOM::IRSpy::Web, +ZOOM::IRSpy::Test, +ZOOM::IRSpy::Maintenance. The ZOOM-Perl module, http://search.cpan.org/~mirk/Net-Z3950-ZOOM/