X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=cf2a91f76133d663c6fb7d0e2cb90f8423785db1;hp=2024e4609f70bb3ef55b57a422bdf902c63dd5f6;hb=8a7bebe7906f8885a73716a4d4fc905ca8b0aae2;hpb=eed4eeb07f8ebd15948f73006b7b686a6de827c1

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 2024e46..cf2a91f 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.7 2006-07-18 11:10:38 mike Exp $
+# $Id: IRSpy.pm,v 1.20 2006-09-26 09:24:45 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 {
@@ -49,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'");
 
@@ -69,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; ### Does this get written through the ref?
+	    $target = $newtarget; # This is written through the ref
 	}
 	push @qlist,
 	    (qq[(host = "$host" and port = "$port" and path="$db")]);
@@ -100,7 +105,7 @@ sub _parse_target_string {
 	($host, $db) = ($target =~ /(.*?)\/(.*)/);
 	$target = "$host:$port/$db";
     }
-    die "invalid target string '$target'"
+    die "$0: invalid target string '$target'"
 	if !defined $host;
 
     return ($host, $port, $db, $target);
@@ -147,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,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/&/&amp/g;
+	    $xml =~ s/</&lt;/g;
+	    $xml =~ s/>/&gt;/g;
+	    print "Updated with xml=<br/>\n<pre>$xml</pre>\n";
+	}
+    }
+
+    return $res;
 }
 
 
@@ -200,6 +232,10 @@ 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 {
 	my $slashSeperatedTname = $tname;
 	$slashSeperatedTname =~ s/::/\//g;
@@ -211,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;
 }
 
 
@@ -230,17 +269,29 @@ sub record {
 	# Can be called with a Connection instead of a target-name
 	my $conn = $target;
 	$target = $conn->option("host");
-	$this->log("irspy_debug", "record() resolved $conn to '$target'");
     }
 
     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/