Better targets() API.

[irspy-moved-to-github.git] / lib / ZOOM / IRSpy.pm

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 21b1a0f..d5672e8 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.14 2006-07-27 15:51:05 mike Exp $
+# $Id: IRSpy.pm,v 1.17 2006-09-22 15:02:24 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,11 +74,11 @@ 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);
@@ -201,13 +205,26 @@ sub check {
     my $res = $this->_run_test("Main");
     foreach my $target (sort keys %{ $this->{target2record} }) {
        my $rec = $this->{target2record}->{$target};
-       # It's a shame that LibXML can't pretty-print this
-       print STDERR "$target: zeerex='", $rec->{zeerex}, "' = \n",
-           $rec->{zeerex}->toString(), "\n";
-       ### Write record back to database, if modified.
+       # 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/&/&amp/g;
+           $xml =~ s/</&lt;/g;
+           $xml =~ s/>/&gt;/g;
+           print "Updated with xml=<br/>\n<pre>$xml</pre>\n";
+       }
     }
-    return $res;
 
+    return $res;
 }