X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=21b1a0f11dbdd072abe87d565e1358a123a06ce7;hb=04cd3339ef85194bd00546ecd3eb21e8a5222dde;hp=d9674b7e18c21763b3e11aae74d74534ece871f4;hpb=8cd84184f5179731f9ed55743f3a8a37c295e499;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index d9674b7..21b1a0f 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.9 2006-07-21 11:28:16 mike Exp $
+# $Id: IRSpy.pm,v 1.14 2006-07-27 15:51:05 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -49,6 +49,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'");
 
@@ -100,7 +101,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,17 +148,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'");
@@ -192,7 +198,16 @@ 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};
+	# 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.
+    }
+    return $res;
+
 }
 
 
@@ -200,6 +215,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 +230,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;
 }
 
 
@@ -236,6 +258,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