X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=lib%2FZOOM%2FIRSpy.pm;h=6ea8910d8d669860c72e20805c9a7f92b6637b4b;hb=dfad8457017003a53ac4449456e632439fdb3235;hp=d2a1ad0f9b18bad2a18acb6492cabf24af63408a;hpb=e1ba80e56e69af734e16fd28eba7ab6d27d01efd;p=irspy-moved-to-github.git

diff --git a/lib/ZOOM/IRSpy.pm b/lib/ZOOM/IRSpy.pm
index d2a1ad0..6ea8910 100644
--- a/lib/ZOOM/IRSpy.pm
+++ b/lib/ZOOM/IRSpy.pm
@@ -1,4 +1,4 @@
-# $Id: IRSpy.pm,v 1.56 2006-12-21 16:35:11 mike Exp $
+# $Id: IRSpy.pm,v 1.64 2007-02-22 17:46:23 mike Exp $
 
 package ZOOM::IRSpy;
 
@@ -246,9 +246,9 @@ sub _render_record {
 
 
 sub _irspy_to_zeerex {
-    my ($this, $conn) = @_;
+    my $this = shift();
+    my($conn, $save_xml) = @_;
     my $irspy_doc = $conn->record()->{zeerex}->ownerDocument;
-    my $save_xml = 0;
 
     if ($save_xml) {
 	unlink('/tmp/irspy_orig.xml');
@@ -274,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);
 }
 
@@ -404,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);
@@ -415,15 +427,19 @@ sub check {
 	eval { $conn->_check() };
 	if ($@ &&
 	    ($ev == ZOOM::Event::RECV_DATA ||
-	     $ev == ZOOM::Event::RECV_APDU ||
-	     $ev == ZOOM::Event::ZEND)) {
+	     $ev == ZOOM::Event::ZEND ||
+	     ($ev == ZOOM::Event::RECV_APDU &&
+	      !$task->isa("ZOOM::IRSpy::Task::Connect")))) {
 	    # An error in, say, a search response, becomes visible to
 	    # ZOOM before the Receive Data event is sent and persists
 	    # until after the End, which means that successive events
 	    # 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.
+	    # "unimportant" events.  We can also ignore errors on
+	    # RECV_APDU in most cases, but since there is no RECV_INIT
+	    # event, we need to avoid doing this if the task is
+	    # Connect.  Yuck -- special cases.
+	    # ### But this doesn't work for, say, a Connection Refused,
+	    # as the only event that shows us this error is the ZEND.
 	    $conn->log("irspy_event", "ignoring error ",
 		       "on event $ev ($evstr): $@");
 	    next;
@@ -505,15 +521,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 {
@@ -523,11 +547,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;
     }