Warning of left-over events now emitted using yaz_log() rather than warn().

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

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index ff85dec..b2e0f15 100644 (file)
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.55 2006-12-18 15:32:32 mike Exp $
+# $Id: IRSpy.pm,v 1.63 2007-02-22 15:43:13 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -246,17 +246,24 @@ sub _render_record {
 
 
 sub _irspy_to_zeerex {
-    my ($this, $conn) = @_;
+    my $this = shift();
+    my($conn, $save_xml) = @_;
     my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
-    #open FH, '>/tmp/irspy_orig.xml';
-    #print FH $irspy_doc->toString();
-    #close FH;
+
+    if ($save_xml) {
+       unlink('/tmp/irspy_orig.xml');
+       open FH, '>/tmp/irspy_orig.xml';
+       print FH $irspy_doc->toString();
+       close FH;
+    }
     my %params = ();
     my $result = $this->{irspy_to_zeerex_style}->transform($irspy_doc, %params);
-
-    #open FH, '>/tmp/irspy_transformed.xml';
-    #print FH $result->toString();
-    #close FH;
+    if ($save_xml) {
+       unlink('/tmp/irspy_transformed.xml');
+       open FH, '>/tmp/irspy_transformed.xml';
+       print FH $result->toString();
+       close FH;
+    }
 
     return $result->documentElement();
 }
@@ -267,7 +274,7 @@ sub _rewrite_record {
     my($conn) = @_;
 
     $conn->log("irspy", "rewriting XML record");
-    my $rec = $this->_irspy_to_zeerex($conn);
+    my $rec = $this->_irspy_to_zeerex($conn, $ENV{IRSPY_SAVE_XML});
     _really_rewrite_record($this->{conn}, $rec);
 }
 
@@ -397,7 +404,19 @@ sub check {
        my $i0 = ZOOM::event(\@conn);
        $this->log("irspy_event",
                   "ZOOM_event(", scalar(@conn), " connections) = $i0");
-       last if $i0 == 0 || $i0 == -3; # no events or no connections
+       if ($i0 < 1) {
+           my %messages = (
+                           0 => "no events remain",
+                           -1 => "ZOOM::event() argument not a reference",
+                           -2 => "ZOOM::event() reference not an array",
+                           -3 => "no connections remain",
+                           -4 => "too many connections for ZOOM::event()",
+                           );
+           my $message = $messages{$i0} || "ZOOM::event() returned $i0";
+           $this->log("irspy", $message);
+           last;
+       }
+
        my $conn = $conn[$i0-1];
        my $ev = $conn->last_event();
        my $evstr = ZOOM::event_str($ev);
@@ -408,7 +427,6 @@ sub check {
        eval { $conn->_check() };
        if ($@ &&
            ($ev == ZOOM::Event::RECV_DATA ||
-            $ev == ZOOM::Event::RECV_APDU ||
             $ev == ZOOM::Event::ZEND)) {
            # An error in, say, a search response, becomes visible to
            # ZOOM before the Receive Data event is sent and persists
@@ -416,7 +434,7 @@ sub check {
            # each report the same error.  So we just ignore errors on
            # "unimportant" events.  ### But this doesn't work for,
            # say, a Connection Refused, as the only event that shows
-           # us this error is the End.
+           # us this error is the ZEND.
            $conn->log("irspy_event", "ignoring error ",
                       "on event $ev ($evstr): $@");
            next;
@@ -498,15 +516,23 @@ sub check {
            $this->log("irspy", "$conn still has ZOOM-C level tasks queued: see below");
            $finished = 0;
        }
+       my $ev = $conn->peek_event();
+       if ($ev != 0 && $ev != ZOOM::Event::ZEND) {
+           my $evstr = ZOOM::event_str($ev);
+           $this->log("irspy", "$conn has event $ev ($evstr) waiting");
+           $finished = 0;
+       }
        if (!$conn->option("rewrote_record")) {
            $this->log("irspy", "$conn did not rewrite its ZeeRex record");
            $finished = 0;
        }
     }
 
-    # This really shouldn't be necessary, but it's belt and braces
+    # This really shouldn't be necessary, and in practice it rarely
+    # helps, but it's belt and braces.  For now, we don't do this
+    # (hence the zero in the $nruns check).
     if (!$finished) {
-       if (++$nruns < 10) {
+       if (++$nruns < 0) {
            $this->log("irspy", "back into main loop, ${nruns}th time");
            goto ROUND_AND_ROUND_WE_GO;
        } else {
@@ -516,11 +542,12 @@ sub check {
 
     # This shouldn't happen emit anything either:
     @conn = @{ $this->{connections} };
-    while (my $i1 = ZOOM::event(\@conn)) {
+    while ((my $i1 = ZOOM::event(\@conn)) > 0) {
        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)"
+       $this->log("irspy",
+                  "$conn still has ZOOM-C level task queued: $ev ($evstr)")
            if $ev != ZOOM::Event::ZEND;
     }