X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=a8f5d90e283ad00afd36a19473c94b1848c6b58c;hp=705cf794a46b4cf17d040784971a37e09b0c5e0e;hb=d104e0fcbd34a71d39ed68ac874ad2e7c34c3c23;hpb=2592265ce9631419e2b15eeb51d9103e35786ce8
diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 705cf79..a8f5d90 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.10 2006-07-21 11:50:17 mike Exp $
+# $Id: IRSpy.pm,v 1.21 2006-09-27 12:49:46 mike Exp $
package ZOOM::IRSpy;
@@ -37,9 +37,13 @@ BEGIN {
sub new {
my $class = shift();
- my($dbname) = @_;
+ my($dbname, $user, $password) = @_;
- my $conn = new ZOOM::Connection($dbname)
+ my @options;
+ push @options, (user => $user, password => $password)
+ if defined $user;
+
+ my $conn = new ZOOM::Connection($dbname, 0, @options)
or die "$0: can't connection to IRSpy database 'dbname'";
my $this = bless {
@@ -70,17 +74,17 @@ 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, $newtarget) = _parse_target_string($target);
if ($newtarget ne $target) {
$this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
- $target = $newtarget; # This written through the ref
+ $target = $newtarget; # This is written through the ref
}
push @qlist,
(qq[(host = "$host" and port = "$port" and path="$db")]);
@@ -148,18 +152,23 @@ 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_debug", "made new record for '$target'");
- $target2record{$target} = new ZOOM::IRSpy::Record($target);
+ #print STDERR "making '$target' record without zeerex\n";
+ $target2record{$target} = new ZOOM::IRSpy::Record($this, $target);
} else {
$this->log("irspy_debug", "using existing record for '$target'");
}
@@ -192,8 +201,32 @@ sub _render_record {
#
sub check {
my $this = shift();
+ my($test) = @_;
+
+ $test = "Main" if !defined $test;
+ my $res = $this->_run_test($test);
+ 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 $this->_run_test("Main"); + return $res; } @@ -218,7 +251,8 @@ sub _run_test { $this->log("irspy", "running test '$tname'"); push @{ $this->{tests} }, $tname; my $test = "ZOOM::IRSpy::Test::$tname"->new($this); - my $res =$test->run(); + my $res = $test->run(); + $this->pod()->remove_callbacks(); pop @{ $this->{tests} }; return $res; } @@ -244,10 +278,23 @@ sub record { } +# 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/