X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=cf2a91f76133d663c6fb7d0e2cb90f8423785db1;hp=973c68a554cad6fff31cb17a1477ae7dae6d3994;hb=8a7bebe7906f8885a73716a4d4fc905ca8b0aae2;hpb=743ea7f5fb483bb6d7bd519121730d05e6d25a48
diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 973c68a..cf2a91f 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.4 2006-06-21 14:35:03 mike Exp $
+# $Id: IRSpy.pm,v 1.20 2006-09-26 09:24:45 mike Exp $
package ZOOM::IRSpy;
@@ -29,13 +29,21 @@ 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();
- my($dbname) = @_;
+ my($dbname, $user, $password) = @_;
+
+ my @options;
+ push @options, (user => $user, password => $password)
+ if defined $user;
- my $conn = new ZOOM::Connection($dbname)
+ my $conn = new ZOOM::Connection($dbname, 0, @options)
or die "$0: can't connection to IRSpy database 'dbname'";
my $this = bless {
@@ -45,6 +53,7 @@ sub new {
targets => undef, # filled in later
target2record => undef, # filled in later
pod => undef, # filled in later
+ tests => [], # stack of tests currently being executed
}, $class;
$this->log("irspy", "starting up with database '$dbname'");
@@ -65,22 +74,18 @@ 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 = 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; # This is written through the ref
}
- die "invalid target string '$target'"
- if !defined $host;
push @qlist,
(qq[(host = "$host" and port = "$port" and path="$db")]);
}
@@ -90,6 +95,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 "$0: 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.
@@ -130,20 +152,25 @@ sub initialise {
}
my $rs = $this->{conn}->search(new ZOOM::Query::CQL($this->{query}));
+ #print "size='", $rs->size(), "'\n";
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($target, $zeerex);
+ new ZOOM::IRSpy::Record($this, $target, $zeerex);
+ push @{ $this->{targets} }, $target
+ if $this->{allrecords};
}
foreach my $target (keys %target2record) {
my $record = $target2record{$target};
if (!defined $record) {
- $this->log("irspy", "made new record for '$target'");
- $target2record{$target} = new ZOOM::IRSpy::Record($target);
+ $this->log("irspy_debug", "made new record for '$target'");
+ #print STDERR "making '$target' record without zeerex\n";
+ $target2record{$target} = new ZOOM::IRSpy::Record($this, $target);
} else {
- $this->log("irspy", "using existing record for '$target'");
+ $this->log("irspy_debug", "using existing record for '$target'");
}
}
@@ -175,7 +202,29 @@ sub _render_record {
sub check {
my $this = shift();
- return $this->_run_test("Main");
+ my $res = $this->_run_test("Main");
+ foreach my $target (sort keys %{ $this->{target2record} }) {
+ my $rec = $this->{target2record}->{$target};
+ # Write record back to database
+ my $p = $this->{conn}->package();
+ $p->option(action => "specialUpdate");
+ my $xml = $rec->{zeerex}->toString();
+ $p->option(record => $xml);
+ $p->send("update");
+ $p->destroy();
+
+ $p = $this->{conn}->package();
+ $p->send("commit");
+ $p->destroy();
+ if (0) {
+ $xml =~ s/&/&/g;
+ $xml =~ s/</g;
+ $xml =~ s/>/>/g;
+ print "Updated with xml=
\n
$xml\n"; + } + } + + return $res; } @@ -183,8 +232,14 @@ sub _run_test { my $this = shift(); my($tname) = @_; + die("$0: test-hierarchy loop detected: " . + join(" -> ", @{ $this->{tests} }, $tname)) + if grep { $_ eq $tname } @{ $this->{tests} }; + eval { - require "ZOOM/IRSpy/Test/$tname.pm"; + 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/ ? () : " ($@)"); @@ -192,8 +247,11 @@ sub _run_test { } $this->log("irspy", "running test '$tname'"); + push @{ $this->{tests} }, $tname; my $test = "ZOOM::IRSpy::Test::$tname"->new($this); - return $test->run(); + my $res =$test->run(); + pop @{ $this->{tests} }; + return $res; } @@ -206,14 +264,34 @@ sub pod { sub record { my $this = shift(); my($target) = @_; - return $this->{target2record}->{$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)}; } +# Utility method, really nothing to do with IRSpy +sub isodate { + my $this = shift(); + my($time) = @_; + + my($sec, $min, $hour, $mday, $mon, $year) = localtime($time); + return sprintf("%04d-%02d-%02dT%02d:%02d:%02d", + $year+1900, $mon+1, $mday, $hour, $min, $sec); +} + =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/