X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=53c8fe067cd87c858650a3100e5fb6cb5ccc15e6;hb=ef1ec4ae82e393dc4b9bdc1c5e70aa33cfc21c68;hp=06bc931e752cf6936729e5c2547b54ea60963b04;hpb=ce02e1846d6a589e0d8a45cf516c3d765efa5a8f;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 06bc931..53c8fe0 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.15 2006-09-18 16:30:25 mike Exp $
+# $Id: IRSpy.pm,v 1.18 2006-09-25 12:44:38 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 = grep { $_ ne "" } 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")]);
@@ -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;
 }