X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=5cbd307ba36cea8ae303e80149674ceb669a8231;hb=8570c41b30c77224145e62703cd0056a636b6687;hp=758b5bfed44e5cd3ca7169c4baf35563df03871e;hpb=3b10d65b1a884072703994a193d9612b6cf5e135;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index 758b5bf..5cbd307 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.44 2006-10-30 15:04:33 mike Exp $
+# $Id: IRSpy.pm,v 1.47 2006-11-02 13:16:49 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -6,9 +6,6 @@ use 5.008;
 use strict;
 use warnings;
 
-use Exporter 'import';
-our @EXPORT_OK = qw(xml_encode irspy_xpath_context);
-
 use Data::Dumper;		# For debugging only
 use File::Basename;
 use XML::LibXSLT;
@@ -23,7 +20,6 @@ use ZOOM::IRSpy::Utils;
 
 our @ISA = qw();
 our $VERSION = '0.02';
-our $irspy_ns = 'http://indexdata.com/irspy/1.0';
 our $irspy_to_zeerex_xsl = dirname(__FILE__) . '/../../xsl/irspy2zeerex.xsl';
 
 
@@ -346,6 +342,7 @@ sub check {
 			$conn->log("irspy", "has no more tests: removing");
 			splice @conn, $i0, 1;
 			$this->_rewrite_record($conn);
+			$conn->option(rewrote_record => 1);
 			next;
 		    }
 
@@ -456,6 +453,27 @@ sub check {
     }
 
     $this->log("irspy", "exiting main loop");
+    # Sanity checks: none of the following should ever happen
+    foreach my $conn (@{ $this->{connections} }) {
+	my $test = $conn->option("current_test_address");
+	my $next = $this->_next_test($test);
+	if (defined $next) {
+	    warn "$conn (in test '$test') has queued test '$next'";
+	}
+	if (my $task = $conn->current_task()) {
+	    warn "$conn still has an active task $task";
+	}
+	if (my $task = $conn->next_task()) {
+	    warn "$conn still has a queued task $task";
+	}
+	if (!$conn->is_idle()) {
+	    warn "$conn is not idle (still has ZOOM-C level tasks queued)";
+	}
+	if (!$conn->option("rewrote_record")) {
+	    warn "$conn did not rewrite its ZeeRex record";
+	}
+    }
+
     return $nskipped;
 }
 
@@ -550,38 +568,6 @@ sub _next_sibling_test {
 }
 
 
-# Utility functions follow, exported for use of web UI
-
-# I can't -- just can't, can't, can't -- believe that this function
-# isn't provided by one of the core XML modules.  But the evidence all
-# says that it's not: among other things, XML::Generator and
-# Template::Plugin both roll their own.  So I will do likewise.  D'oh!
-#
-sub xml_encode {
-    my ($text) = @_;
-    $text =~ s/&/&/g;
-    $text =~ s/</&lt;/g;
-    $text =~ s/>/&gt;/g;
-    $text =~ s/['']/&apos;/g;
-    $text =~ s/[""]/&quot;/g;
-    return $text;
-}
-
-
-sub irspy_xpath_context {
-    my($zoom_record) = @_;
-
-    my $xml = $zoom_record->render();
-    my $parser = new XML::LibXML();
-    my $doc = $parser->parse_string($xml);
-    my $root = $doc->getDocumentElement();
-    my $xc = XML::LibXML::XPathContext->new($root);
-    $xc->registerNs(e => 'http://explain.z3950.org/dtd/2.0/');
-    $xc->registerNs(i => $irspy_ns);
-    return $xc;
-}
-
-
 =head1 SEE ALSO
 
 ZOOM::IRSpy::Record,