X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=71c84bddb1fb04c4002f061d0bfb801df2df90a0;hp=8988a5df4e3bb0e5adfa4c7e8d45c06a036d218d;hb=d865b850cd4bdb4a44db23af3b291cfbce4510e8;hpb=f4ad227f469be5cf0d848e1e7e99f7620abcf4a9 diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index 8988a5d..71c84bd 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,4 @@ -# $Id: IRSpy.pm,v 1.2 2006-06-20 12:36:13 mike Exp $ +# $Id: IRSpy.pm,v 1.8 2006-07-21 11:27:02 mike Exp $ package ZOOM::IRSpy; @@ -29,7 +29,11 @@ protocols. It is a successor to the ZSpy program. =cut -BEGIN { ZOOM::Log::mask_str("irspy") } +BEGIN { + ZOOM::Log::mask_str("irspy"); + ZOOM::Log::mask_str("irspy_test"); + ZOOM::Log::mask_str("irspy_debug"); +} sub new { my $class = shift(); @@ -41,7 +45,10 @@ sub new { my $this = bless { conn => $conn, allrecords => 1, # unless overridden by targets() - # query and targets will be filled in later + query => undef, # filled in later + targets => undef, # filled in later + target2record => undef, # filled in later + pod => undef, # filled in later }, $class; $this->log("irspy", "starting up with database '$dbname'"); @@ -69,15 +76,11 @@ sub targets { my @targets = split /\s+/, $targetList; my @qlist; foreach my $target (@targets) { - my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/); - if (!defined $host) { - $port = 210; - ($host, $db) = ($target =~ /(.*?)\/(.*)/); - $this->log("irspy", "rewrote '$target' to '$host:$port/$db'"); - $target = "$host:$port/$db"; + my($host, $port, $db, $newtarget) = _parse_target_string($target); + if ($newtarget ne $target) { + $this->log("irspy_debug", "rewriting '$target' to '$newtarget'"); + $target = $newtarget; ### Does this get written through the ref? } - die "invalid target string '$target'" - if !defined $host; push @qlist, (qq[(host = "$host" and port = "$port" and path="$db")]); } @@ -87,6 +90,23 @@ sub targets { } +# Also used by ZOOM::IRSpy::Record +sub _parse_target_string { + my($target) = @_; + + my($host, $port, $db) = ($target =~ /(.*?):(.*?)\/(.*)/); + if (!defined $host) { + $port = 210; + ($host, $db) = ($target =~ /(.*?)\/(.*)/); + $target = "$host:$port/$db"; + } + die "invalid target string '$target'" + if !defined $host; + + return ($host, $port, $db, $target); +} + + # There are two cases. # # 1. A specific set of targets is nominated on the command line. @@ -137,19 +157,17 @@ sub initialise { foreach my $target (keys %target2record) { my $record = $target2record{$target}; if (!defined $record) { - $this->log("irspy", "new record for '$target'"); + $this->log("irspy_debug", "made new record for '$target'"); $target2record{$target} = new ZOOM::IRSpy::Record($target); } else { - $this->log("irspy", "existing record for '$target' $record"); + $this->log("irspy_debug", "using existing record for '$target'"); } } -} - -sub check { - my $this = shift(); - - $this->{pod} = new ZOOM::Pod(@{ $this->{targets} }) + $this->{target2record} = \%target2record; + $this->{pod} = new ZOOM::Pod(@{ $this->{targets} }); + delete $this->{targets}; # The information is now in the Pod. + delete $this->{query}; # Not needed at all } @@ -167,68 +185,56 @@ sub _render_record { } -#my $pod = new ZOOM::Pod(@ARGV); -#$pod->option(elementSetName => "b"); -#$pod->callback(ZOOM::Event::RECV_SEARCH, \&completed_search); -#$pod->callback(ZOOM::Event::RECV_RECORD, \&got_record); -##$pod->callback(exception => \&exception_thrown); -#$pod->search_pqf("the"); -#my $err = $pod->wait(); -#die "$pod->wait() failed with error $err" if $err; -# -#sub completed_search { -# my($conn, $state, $rs, $event) = @_; -# print $conn->option("host"), ": found ", $rs->size(), " records\n"; -# $state->{next_to_fetch} = 0; -# $state->{next_to_show} = 0; -# request_records($conn, $rs, $state, 2); -# return 0; -#} -# -#sub got_record { -# my($conn, $state, $rs, $event) = @_; -# -# { -# # Sanity-checking assertions. These should be impossible -# my $ns = $state->{next_to_show}; -# my $nf = $state->{next_to_fetch}; -# if ($ns > $nf) { -# die "next_to_show > next_to_fetch ($ns > $nf)"; -# } elsif ($ns == $nf) { -# die "next_to_show == next_to_fetch ($ns)"; -# } -# } -# -# my $i = $state->{next_to_show}++; -# my $rec = $rs->record($i); -# print $conn->option("host"), ": record $i is ", render_record($rec), "\n"; -# request_records($conn, $rs, $state, 3) -# if $i == $state->{next_to_fetch}-1; -# -# return 0; -#} -# -#sub exception_thrown { -# my($conn, $state, $rs, $exception) = @_; -# print "Uh-oh! $exception\n"; -# return 0; -#} -# -#sub request_records { -# my($conn, $rs, $state, $count) = @_; -# -# my $i = $state->{next_to_fetch}; -# ZOOM::Log::log("irspy", "requesting $count records from $i"); -# $rs->records($i, $count, 0); -# $state->{next_to_fetch} += $count; -#} -# -#sub render_record { -# my($rec) = @_; +# Returns: +# 0 all tests successfully run +# 1 some tests skipped # -# return "undefined" if !defined $rec; -# return "'" . $rec->render() . "'"; -#} +sub check { + my $this = shift(); + + return $this->_run_test("Main"); +} + + +sub _run_test { + my $this = shift(); + my($tname) = @_; + + eval { + my $slashSeperatedTname = $tname; + $slashSeperatedTname =~ s/::/\//g; + require "ZOOM/IRSpy/Test/$slashSeperatedTname.pm"; + }; if ($@) { + $this->log("warn", "can't load test '$tname': skipping", + $@ =~ /^Can.t locate/ ? () : " ($@)"); + return 1; + } + + $this->log("irspy", "running test '$tname'"); + my $test = "ZOOM::IRSpy::Test::$tname"->new($this); + return $test->run(); +} + + +# Access methods for the use of Test modules +sub pod { + my $this = shift(); + return $this->{pod}; +} + +sub record { + my $this = shift(); + my($target) = @_; + + if (ref($target) && $target->isa("ZOOM::Connection")) { + # Can be called with a Connection instead of a target-name + my $conn = $target; + $target = $conn->option("host"); + } + + return $this->{target2record}->{lc($target)}; +} + =head1 SEE ALSO