X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=5e28956ad8c64e05c5e5769d2da3b31c6afb8064;hp=705cf794a46b4cf17d040784971a37e09b0c5e0e;hb=95688f2c6952387b7fa26c9dd41687e0d5ac8c29;hpb=2592265ce9631419e2b15eeb51d9103e35786ce8
diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 705cf79..5e28956 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.16 2006-09-20 16:12:56 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 {
@@ -74,7 +78,7 @@ sub targets {
$this->log("irspy", "setting explicit list of targets '$targetList'");
$this->{allrecords} = 0;
- my @targets = split /\s+/, $targetList;
+ my @targets = grep { $_ ne "" } split /\s+/, $targetList;
my @qlist;
foreach my $target (@targets) {
my($host, $port, $db, $newtarget) = _parse_target_string($target);
@@ -148,17 +152,22 @@ 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);
+ 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'");
+ #print STDERR "making '$target' record without zeerex\n";
$target2record{$target} = new ZOOM::IRSpy::Record($target);
} else {
$this->log("irspy_debug", "using existing record for '$target'");
@@ -193,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; } @@ -244,6 +275,16 @@ 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