-# $Id: IRSpy.pm,v 1.41 2006-10-27 00:45:12 mike Exp $
+# $Id: IRSpy.pm,v 1.52 2006-12-06 11:26:52 mike Exp $
package ZOOM::IRSpy;
use strict;
use warnings;
-use Exporter 'import';
-our @EXPORT_OK = qw(xml_encode irspy_xpath_context);
-
use Data::Dumper; # For debugging only
use File::Basename;
use XML::LibXSLT;
use ZOOM::IRSpy::Node;
use ZOOM::IRSpy::Connection;
use ZOOM::IRSpy::Record;
+use ZOOM::IRSpy::Utils qw(cql_target);
our @ISA = qw();
our $VERSION = '0.02';
-our $irspy_ns = 'http://indexdata.com/irspy/1.0';
our $irspy_to_zeerex_xsl = dirname(__FILE__) . '/../../xsl/irspy2zeerex.xsl';
sub TASK_DONE { 18 } # Task is complete, next task should begin
sub TEST_GOOD { 8 } # Whole test is complete, and succeeded
sub TEST_BAD { 31 } # Whole test is complete, and failed
+sub TEST_SKIPPED { 12 } # Test couldn't be run
package ZOOM::IRSpy;
$this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
$target = $newtarget; # This is written through the ref
}
- push @qlist, (qq[(host="$host" and port="$port" and path="$db")]);
+ push @qlist, cql_target($host, $port, $db);
}
$this->{targets} = \@targets;
$conn->log("irspy", "rewriting XML record");
my $rec = $this->_irspy_to_zeerex($conn);
- my $p = $this->{conn}->package();
+ _really_rewrite_record($this->{conn}, $rec);
+}
+
+
+sub _really_rewrite_record {
+ my($conn, $rec) = @_;
+
+ my $p = $conn->package();
$p->option(action => "specialUpdate");
my $xml = $rec->toString();
$p->option(record => $xml);
$p->send("update");
$p->destroy();
- $p = $this->{conn}->package();
+ $p = $conn->package();
$p->send("commit");
$p->destroy();
if (0) {
$conn->log("irspy", "has no more tests: removing");
splice @conn, $i0, 1;
$this->_rewrite_record($conn);
+ $conn->option(rewrote_record => 1);
next;
}
$nskipped += $n;
}
}
+
+ } elsif ($res == ZOOM::IRSpy::Status::TEST_SKIPPED) {
+ $conn->log("irspy_task", "test skipped during task $task");
+ $conn->current_task(0);
+ $conn->next_task(0);
+ # I think that's all we need to do
+
} else {
die "unknown callback return-value '$res'";
}
}
$this->log("irspy", "exiting main loop");
+ # Sanity checks: none of the following should ever happen
+ foreach my $conn (@{ $this->{connections} }) {
+ my $test = $conn->option("current_test_address");
+ my $next = $this->_next_test($test);
+ if (defined $next) {
+ warn "$conn (in test '$test') has queued test '$next'";
+ }
+ if (my $task = $conn->current_task()) {
+ warn "$conn still has an active task $task";
+ }
+ if (my $task = $conn->next_task()) {
+ warn "$conn still has a queued task $task";
+ }
+ if (!$conn->is_idle()) {
+ warn "$conn still has ZOOM-C level tasks queued: see below";
+ }
+ if (!$conn->option("rewrote_record")) {
+ warn "$conn did not rewrite its ZeeRex record";
+ }
+ }
+
+ # This shouldn't happen emit anything either:
+ @conn = @{ $this->{connections} };
+ while (my $i1 = ZOOM::event(\@conn)) {
+ my $conn = $conn[$i1-1];
+ my $ev = $conn->last_event();
+ my $evstr = ZOOM::event_str($ev);
+ warn "$conn still has ZOOM-C level task queued: $ev ($evstr)"
+ if $ev != ZOOM::Event::ZEND;
+ }
+
return $nskipped;
}
my $fullName = "ZOOM/IRSpy/Test/$slashSeperatedTname.pm";
eval {
- ### This next line shouldn't be necessary, as we should
- # already be running in an environment where the test
- # modules are available -- otherwise, how did _this_ module
- # get loaded? But it seems that for reasons I don't
- # understand we do sometimes (not always!) need this when
- # running under Apache.
- use lib '/usr/local/src/cvs/irspy/lib';
require $fullName;
$this->log("irspy", "successfully required '$fullName'");
}; if ($@) {
my $maybe = $this->_next_sibling_test($address);
last if !defined $maybe;
$nskipped++;
- $this->log("irspy", "skipping $nskipped tests to '$address'");
$address = $maybe;
+ $this->log("irspy", "skipping $nskipped tests to '$address'");
}
return ($address, $nskipped);
}
-# Utility functions follow, exported for use of web UI
-
-# I can't -- just can't, can't, can't -- believe that this function
-# isn't provided by one of the core XML modules. But the evidence all
-# says that it's not: among other things, XML::Generator and
-# Template::Plugin both roll their own. So I will do likewise. D'oh!
-#
-sub xml_encode {
- my ($text) = @_;
- $text =~ s/&/&/g;
- $text =~ s/</</g;
- $text =~ s/>/>/g;
- $text =~ s/['']/'/g;
- $text =~ s/[""]/"/g;
- return $text;
-}
-
-
-sub irspy_xpath_context {
- my($zoom_record) = @_;
-
- my $xml = $zoom_record->render();
- my $parser = new XML::LibXML();
- my $doc = $parser->parse_string($xml);
- my $root = $doc->getDocumentElement();
- my $xc = XML::LibXML::XPathContext->new($root);
- $xc->registerNs(e => 'http://explain.z3950.org/dtd/2.0/');
- $xc->registerNs(i => $irspy_ns);
- return $xc;
-}
-
-
=head1 SEE ALSO
ZOOM::IRSpy::Record,
projects / irspy-moved-to-github.git / blobdiff