X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=ea292c9cb2320b9222eaed346416c6ee91cb44f0;hb=f9fa0cec384029d5caafe4992c2a89704ef10632;hp=e6f2c52eb6ac82ead454618866b23b2cf770da89;hpb=26360761aba0b9b4043c8cc3f0dcdb073491ea13;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index e6f2c52..ea292c9 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.48 2006-11-03 13:11:29 mike Exp $
+# $Id: IRSpy.pm,v 1.51 2006-11-21 11:48:01 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::Record;
-use ZOOM::IRSpy::Utils;
+use ZOOM::IRSpy::Utils qw(cql_target);
 
 our @ISA = qw();
 our $VERSION = '0.02';
@@ -117,7 +117,7 @@ sub targets {
 	    $this->log("irspy_debug", "rewriting '$target' to '$newtarget'");
 	    $target = $newtarget; # This is written through the ref
 	}
-	push @qlist, (qq[(host="$host" and port="$port" and path="$db")]);
+	push @qlist, cql_target($host, $port, $db);
     }
 
     $this->{targets} = \@targets;
@@ -475,13 +475,22 @@ sub check {
 	    warn "$conn still has a queued task $task";
 	}
 	if (!$conn->is_idle()) {
-	    warn "$conn is not idle (still has ZOOM-C level tasks queued)";
+	    warn "$conn still has ZOOM-C level tasks queued: see below";
 	}
 	if (!$conn->option("rewrote_record")) {
 	    warn "$conn did not rewrite its ZeeRex record";
 	}
     }
 
+    # This shouldn't happen emit anything either:
+    @conn = @{ $this->{connections} };
+    while (my $i1 = ZOOM::event(\@conn)) {
+	my $conn = $conn[$i1-1];
+	my $ev = $conn->last_event();
+	my $evstr = ZOOM::event_str($ev);
+	warn "$conn still has ZOOM-C level task queued: $ev ($evstr)";
+    }
+
     return $nskipped;
 }
 
@@ -556,8 +565,8 @@ sub _last_sibling_test {
 	my $maybe = $this->_next_sibling_test($address);
 	last if !defined $maybe;
 	$nskipped++;
-	$this->log("irspy", "skipping $nskipped tests to '$address'");
 	$address = $maybe;
+	$this->log("irspy", "skipping $nskipped tests to '$address'");
     }
 
     return ($address, $nskipped);