Tree of tests compiled in initalise() rather then check(), so that

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

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 0df24d7..8781f84 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.75 2007-03-09 08:56:37 mike Exp $
+# $Id: IRSpy.pm,v 1.82 2007-04-18 15:35:51 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -16,7 +16,7 @@ use Net::Z3950::ZOOM 1.13;    # For the ZOOM version-check only
 use ZOOM::IRSpy::Node;
 use ZOOM::IRSpy::Connection;
 use ZOOM::IRSpy::Stats;
-use ZOOM::IRSpy::Utils qw(cql_target render_record);
+use ZOOM::IRSpy::Utils qw(cql_target render_record irspy_xpath_context);
 
 our @ISA = qw();
 our $VERSION = '0.02';
@@ -42,8 +42,8 @@ ZOOM::IRSpy - Perl extension for discovering and analysing IR services
  use ZOOM::IRSpy;
  $spy = new ZOOM::IRSpy("target/string/for/irspy/database");
  $spy->targets(@targets);
- $spy->initialise();
- $res = $spy->check("Main");
+ $spy->initialise("Main");
+ $res = $spy->check();
 
 =head1 DESCRIPTION
 
@@ -93,6 +93,7 @@ sub new {
        queue => undef,         # Filled in by initialise()
         libxml => $libxml,
         irspy_to_zeerex_style => $irspy_to_zeerex_style,
+       test => undef,          # Filled in by initialise()
        tests => undef,         # Tree of tests to be executed
        activeSetSize => defined $activeSetSize ? $activeSetSize : 10,
     }, $class;
@@ -166,6 +167,16 @@ sub _parse_target_string {
 #
 sub initialise {
     my $this = shift();
+    my($tname) = @_;
+
+    $tname = "Main" if !defined $tname;
+    $this->{test} = $tname;
+    $this->{tree} = $this->_gather_tests($tname)
+       or die "No tests defined for '$tname'";
+    $this->{tree}->resolve();
+    $this->{tree}->print(0);
+
+    my $timeout = "ZOOM::IRSpy::Test::$tname"->timeout();
 
     my @targets;
     my $targets = $this->{targets};
@@ -190,7 +201,8 @@ sub initialise {
     foreach my $i (1..$n) {
        push @connections, create ZOOM::IRSpy::Connection($this,
                                                          shift @targets,
-                                                         async => 1);
+                                                         async => 1,
+                                                         timeout => $timeout);
     }
 
     $this->{connections} = \@connections;
@@ -234,7 +246,7 @@ sub _rewrite_record {
     # Since IRSpy can run for a long time between writes back to the
     # database, it's quite possible for the server to have closed the
     # connection as idle.  So re-establish it if necessary.
-    $conn->connect($conn->option("host"));
+    $this->{conn}->connect($conn->option("host"));
 
     _really_rewrite_record($this->{conn}, $rec);
     $conn->log("irspy", "rewrote XML record");
@@ -242,7 +254,7 @@ sub _rewrite_record {
 
 
 sub _really_rewrite_record {
-    my($conn, $rec) = @_;
+    my($conn, $rec, $oldid) = @_;
 
     my $p = $conn->package();
     $p->option(action => "specialUpdate");
@@ -251,6 +263,23 @@ sub _really_rewrite_record {
     $p->send("update");
     $p->destroy();
 
+    # This is the expression in the ID-making stylesheet
+    # ../../zebra/zeerex2id.xsl
+    my $xc = irspy_xpath_context($rec);
+    my $id = $xc->find("concat(e:serverInfo/e:host, ':',
+                               e:serverInfo/e:port, '/',
+                               e:serverInfo/e:database)");
+    if (defined $oldid && $id ne $oldid) {
+       # Delete old record;
+       warn "IDs differ (old='$oldid' new='$id')";
+       my $p = $conn->package();
+       $p->option(action => "recordDelete");
+       $p->option(recordIdOpaque => $oldid);
+       $p->option(record => "<dummy/>"); # Work around Zebra bug
+       $p->send("update");
+       $p->destroy();
+    }
+
     $p = $conn->package();
     $p->send("commit");
     $p->destroy();
@@ -293,15 +322,12 @@ sub _really_rewrite_record {
 #
 sub check {
     my $this = shift();
-    my($tname) = @_;
 
-    $tname = "Main" if !defined $tname;
-    $this->{tree} = $this->_gather_tests($tname)
-       or die "No tests defined for '$tname'";
-    $this->{tree}->resolve();
-    #$this->{tree}->print(0);
-    my $nskipped = 0;
+    my $topname = $this->{tree}->name();
+    my $timeout = "ZOOM::IRSpy::Test::$topname"->timeout();
+    $this->log("irspy", "beginnning with test '$topname' (timeout $timeout)");
 
+    my $nskipped = 0;
     my @conn = @{ $this->{connections} };
 
     my $nruns = 0;
@@ -330,13 +356,15 @@ sub check {
                        $conn->log("irspy", "has no more tests: removing");
                        $this->_rewrite_record($conn);
                        $conn->option(rewrote_record => 1);
-                       $conn->destroy();
                        if (@{ $this->{queue} } == 0) {
+                           # Do not destroy: we need this for later sanity checks
                            splice @conn, $i0, 1;
                        } else {
+                           $conn->destroy();
                            $conn[$i0] = create
                                ZOOM::IRSpy::Connection($this,
-                                       shift @{ $this->{queue} }, async => 1);
+                                       shift @{ $this->{queue} }, async => 1,
+                                                       timeout => $timeout);
                            $conn[$i0]->option(current_test_address => "");
                            $conn[$i0]->log("irspy", "entering active pool - ",
                                            scalar(@{ $this->{queue} }),
@@ -468,9 +496,10 @@ sub check {
     }
 
     $this->log("irspy", "exiting main loop");
+
     # Sanity checks: none of the following should ever happen
     my $finished = 1;
-    @conn = @{ $this->{connections} };
+    $this->log("irspy", "performing end-of-run sanity-checks");
     foreach my $conn (@conn) {
        my $test = $conn->option("current_test_address");
        my $next = $this->_next_test($test);