X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=6f5b92ad39f1b735fa980e947826d88f8f6429cd;hp=a496c67e78bf2115dc3e4fb63142d2fa953ec0ba;hb=d94a776fcf0b56a3ffcdcf40f1a60ef350a1d412;hpb=9a2899855f877172facc65a396ce5f6157d3ecd3 diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm index a496c67..6f5b92a 100644 --- a/lib/ZOOM/IRSpy.pm +++ b/lib/ZOOM/IRSpy.pm @@ -1,4 +1,4 @@ -# $Id: IRSpy.pm,v 1.66 2007-02-23 13:18:43 mike Exp $ +# $Id: IRSpy.pm,v 1.73 2007-03-01 14:00:50 mike Exp $ package ZOOM::IRSpy; @@ -85,8 +85,7 @@ sub new { my $this = bless { conn => $conn, - allrecords => 1, # unless overridden by targets() - query => undef, # filled in later + query => "cql.allRecords=1", # unless overridden targets => undef, # filled in later connections => undef, # filled in later libxml => $libxml, @@ -105,6 +104,14 @@ sub log { } +sub find_targets { + my $this = shift(); + my($query) = @_; + + $this->{query} = $query; +} + + # Explicitly nominate a set of targets to check, overriding the # default which is to re-check everything in the database. Each # target already in the database results in the existing record being @@ -116,7 +123,6 @@ sub targets { $this->log("irspy", "setting explicit list of targets ", join(", ", map { "'$_'" } @targets)); - $this->{allrecords} = 0; my @qlist; foreach my $target (@targets) { my($host, $port, $db, $newtarget) = _parse_target_string($target); @@ -149,37 +155,16 @@ sub _parse_target_string { } -# There are two cases. -# -# 1. A specific set of targets is nominated on the command line. -# - Records must be fetched for those targets that are in the DB -# - New, empty records must be made for those that are not. -# - Updated records written to the DB may or may not be new. -# -# 2. All records in the database are to be checked. -# - Records must be fetched for all targets in the DB -# - Updated records written to the DB may not be new. -# -# That's all -- what could be simpler? +# Records must be fetched for all records satisfying $this->{query} If +# $this->{targets} is already set (i.e. a specific list of targets to +# check was specified by a call to targets()), then new, empty records +# must be made for any targets that are not already in the database. # sub initialise { my $this = shift(); my %target2record; - if ($this->{allrecords}) { - # We need to check on every target in the database, which - # means we need to do a "find all". According to the BIB-1 - # semantics document at - # http://www.loc.gov/z3950/agency/bib1.html - # the query - # @attr 2=103 @attr 1=1035 x - # should find all records, but it seems that Zebra doesn't - # support this. Furthermore, when using the "alvis" filter - # (as we do for IRSpy) it doesn't support the use of any BIB-1 - # access point -- not even 1035 "everywhere" -- so instead we - # hack together a search that we know will find all records. - $this->{query} = "port=?*"; - } else { + if ($this->{targets}) { # Prepopulate the target map with nulls so that after we fill # in what we can from the database query, we know which target # IDs we need new records for. @@ -187,37 +172,37 @@ sub initialise { $target2record{lc($target)} = undef; } } + delete $this->{targets}; # Information now in keys of %target2record - $this->log("irspy_debug", "query '", $this->{query}, "'"); my $rs = $this->{conn}->search(new ZOOM::Query::CQL($this->{query})); - delete $this->{query}; # No longer needed at all - $this->log("irspy_debug", "found ", $rs->size(), " target records"); + $this->log("irspy", "'", $this->{query}, "' found ", + $rs->size(), " target records"); + delete $this->{query}; # Information now in $rs + foreach my $i (1 .. $rs->size()) { my $target = _render_record($rs, $i-1, "id"); my $zeerex = _render_record($rs, $i-1, "zeerex"); - #print STDERR "making '$target' record with '$zeerex'\n"; $target2record{lc($target)} = new ZOOM::IRSpy::Record($this, $target, $zeerex); - push @{ $this->{targets} }, $target - if $this->{allrecords}; } # Make records for targets not previously in the database foreach my $target (keys %target2record) { - my $record = $target2record{$target}; - if (!defined $record) { - $this->log("irspy_debug", "made new record for '$target'"); + if (!defined $target2record{$target}) { $target2record{$target} = new ZOOM::IRSpy::Record($this, $target); + $this->log("irspy_debug", "made new record for '$target'"); } else { $this->log("irspy_debug", "using existing record for '$target'"); } } my @connections; - foreach my $target (@{ $this->{targets} }) { + my @targets = sort keys %target2record; + foreach my $target (@targets) { my $conn = create ZOOM::IRSpy::Connection($this, async => 1); $conn->option(host => $target); my $record = delete $target2record{lc($target)}; + die "record undefined for '$target'" if !defined $record; $conn->record($record); push @connections, $conn; } @@ -227,7 +212,6 @@ sub initialise { if %target2record; $this->{connections} = \@connections; - delete $this->{targets}; # The information is now in {connections} } @@ -252,7 +236,8 @@ sub _irspy_to_zeerex { if ($save_xml) { unlink('/tmp/irspy_orig.xml'); - open FH, '>/tmp/irspy_orig.xml'; + open FH, '>/tmp/irspy_orig.xml' + or die "can't write irspy_orig.xml: $!"; print FH $irspy_doc->toString(); close FH; } @@ -260,7 +245,8 @@ sub _irspy_to_zeerex { my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params); if ($save_xml) { unlink('/tmp/irspy_transformed.xml'); - open FH, '>/tmp/irspy_transformed.xml'; + open FH, '>/tmp/irspy_transformed.xml' + or die "can't write irspy_transformed.xml: $!"; print FH $result->toString(); close FH; } @@ -336,6 +322,7 @@ sub check { $tname = "Main" if !defined $tname; $this->{tree} = $this->_gather_tests($tname) or die "No tests defined for '$tname'"; + $this->{tree}->resolve(); #$this->{tree}->print(0); my $nskipped = 0; @@ -400,6 +387,7 @@ sub check { } } + NEXT_EVENT: my $i0 = ZOOM::event(\@conn); $this->log("irspy_event", "ZOOM_event(", scalar(@conn), " connections) = $i0"); @@ -420,35 +408,19 @@ sub check { my $ev = $conn->last_event(); my $evstr = ZOOM::event_str($ev); $conn->log("irspy_event", "event $ev ($evstr)"); + goto NEXT_EVENT if $ev != ZOOM::Event::ZEND; my $task = $conn->current_task(); die "$conn has no current task for event $ev ($evstr)" if !$task; - eval { $conn->_check() }; - if ($@ && - ($ev == ZOOM::Event::RECV_DATA || - $ev == ZOOM::Event::ZEND || - ($ev == ZOOM::Event::RECV_APDU && - !$task->isa("ZOOM::IRSpy::Task::Connect")))) { - # An error in, say, a search response, becomes visible to - # ZOOM before the Receive Data event is sent and persists - # until after the End, which means that successive events - # each report the same error. So we just ignore errors on - # "unimportant" events. We can also ignore errors on - # RECV_APDU in most cases, but since there is no RECV_INIT - # event, we need to avoid doing this if the task is - # Connect. Yuck -- special cases. - # ### But this doesn't work for, say, a Connection Refused, - # as the only event that shows us this error is the ZEND. - $conn->log("irspy_event", "ignoring error ", - "on event $ev ($evstr): $@"); - next; - } my $res; - if ($@) { + eval { $conn->check() }; + if ($@ && ref $@ && $@->isa("ZOOM::Exception")) { my $sub = $task->{cb}->{exception}; die $@ if !defined $sub; $res = &$sub($conn, $task, $task->udata(), $@); + } elsif ($@) { + die "Unexpected non-ZOOM exception: " . ref($@) . " ($@)"; } else { my $sub = $task->{cb}->{$ev}; if (!defined $sub) { @@ -479,19 +451,29 @@ sub check { $conn->next_task(0); if ($res == ZOOM::IRSpy::Status::TEST_BAD) { my $address = $conn->option('current_test_address'); - ($address, my $n) = $this->_last_sibling_test($address); - if (defined $address) { - $conn->log("irspy_test", "skipped $n tests"); - $conn->option(current_test_address => $address); - $nskipped += $n; + $conn->log("irspy", "top-level test failed!") + if $address eq ""; + my $node = $this->{tree}->select($address); + my $skipcount = 0; + while (defined $node->next() && + length($node->next()->address()) >= length($address)) { + $conn->log("irspy_debug", "skipping from '", + $node->address(), "' to '", + $node->next()->address(), "'"); + $node = $node->next(); + $skipcount++; } + + $conn->option(current_test_address => $node->address()); + $conn->log("irspy_test", "skipped $skipcount tests"); + $nskipped += $skipcount; } } elsif ($res == ZOOM::IRSpy::Status::TEST_SKIPPED) { $conn->log("irspy_test", "test skipped during task $task"); $conn->current_task(0); $conn->next_task(0); - # I think that's all we need to do + $nskipped++; } else { die "unknown callback return-value '$res'";