-# $Id: IRSpy.pm,v 1.48 2006-11-03 13:11:29 mike Exp $
+# $Id: IRSpy.pm,v 1.54 2006-12-14 17:24:29 mike Exp $
package ZOOM::IRSpy;
use ZOOM::IRSpy::Node;
use ZOOM::IRSpy::Connection;
use ZOOM::IRSpy::Record;
-use ZOOM::IRSpy::Utils;
+use ZOOM::IRSpy::Stats;
+use ZOOM::IRSpy::Utils qw(cql_target);
our @ISA = qw();
our $VERSION = '0.02';
use ZOOM::IRSpy;
$spy = new ZOOM::IRSpy("target/string/for/irspy/database");
- print $spy->report_status();
+ $spy->targets(@targets);
+ $spy->initialise();
+ $res = $spy->check("Main");
=head1 DESCRIPTION
or die "$0: can't connection to IRSpy database 'dbname'";
my $xslt = new XML::LibXSLT;
+
+ $xslt->register_function($ZOOM::IRSpy::Utils::IRSPY_NS, 'strcmp',
+ \&ZOOM::IRSpy::Utils::xslt_strcmp);
+
my $libxml = new XML::LibXML;
my $xsl_doc = $libxml->parse_file($irspy_to_zeerex_xsl);
my $irspy_to_zeerex_style = $xslt->parse_stylesheet($xsl_doc);
$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;
sub _irspy_to_zeerex {
my ($this, $conn) = @_;
my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
+ #open FH, '>/tmp/irspy_orig.xml';
+ #print FH $irspy_doc->toString();
+ #close FH;
my %params = ();
my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
+ #open FH, '>/tmp/irspy_transformed.xml';
+ #print FH $result->toString();
+ #close FH;
+
return $result->documentElement();
}
warn "$conn still has a queued task $task";
}
if (!$conn->is_idle()) {
- warn "$conn is not idle (still has ZOOM-C level tasks queued)";
+ 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 $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);