X-Git-Url: http://git.indexdata.com/?p=irspy-moved-to-github.git;a=blobdiff_plain;f=lib%2FZOOM%2FPod.pm;h=5c554ec544a510aa4e538bb06b9909106403283e;hp=23c714d754d38de88b62c876f76eef6906d1e99a;hb=4172edcd817f7b978a772fe2b8365e4f1ee8f3bb;hpb=d4d8c2434ea5f5e3beb4cfd5d508e8f07e0e946c

diff --git a/lib/ZOOM/Pod.pm b/lib/ZOOM/Pod.pm
index 23c714d..5c554ec 100644
--- a/lib/ZOOM/Pod.pm
+++ b/lib/ZOOM/Pod.pm
@@ -1,4 +1,4 @@
-# $Id: Pod.pm,v 1.13 2006-06-21 14:31:24 mike Exp $
+# $Id: Pod.pm,v 1.18 2006-07-25 16:51:22 mike Exp $
 
 package ZOOM::Pod;
 
@@ -228,8 +228,8 @@ have one search active on it at a time: this allows the pod to
 maintain the one-to-one mapping between connections and result-sets.
 Submitting a new search on a connection before the old one has
 completed will result in a total failure in the nature of causality,
-and the spontaneous existence-failure of the universe.  Do not do
-this.
+and the spontaneous existence-failure of the universe.  Try to avoid
+doing this too often.
 
 =cut
 
@@ -238,7 +238,9 @@ sub search_pqf {
     my($pqf) = @_;
 
     foreach my $i (0..@{ $this->{conn} }-1) {
-	$this->{rs}->[$i] = $this->{conn}->[$i]->search_pqf($pqf);
+	my $conn = $this->{conn}->[$i];
+	$this->{rs}->[$i] = $conn->search_pqf($pqf)
+	    if !$conn->option("pod_omit");
     }
 }
 
@@ -265,6 +267,10 @@ indicates whether C<wait()> should continue (return-value 0) or return
 immediately (any other value).  Exception-handling callbacks may of
 course re-throw the exception.
 
+Connections that have the C<pod_omit> option set are omitted from
+consideration.  This is useful if, for example, a connection that is
+part of a pod is known to have encountered an unrecoverable error.
+
 =cut
 
 sub wait {
@@ -272,8 +278,30 @@ sub wait {
     my($arg) = @_;
 
     my $res = 0;
-    while ((my $i = ZOOM::event($this->{conn})) != 0) {
+
+    while (1) {
+	my @conn;
+	my @idxmap; # maps indexes into conn to global indexes
+	foreach my $i (0 .. @{ $this->{conn} }-1) {
+	    my $conn = $this->{conn}->[$i];
+	    if ($conn->option("pod_omit")) {
+		#ZOOM::Log::log("pod", "connection $i omitted (",
+			       #$conn->option("host"), ")");
+	      } else {
+		  push @conn, $conn;
+		  push @idxmap, $i;
+		  #ZOOM::Log::log("pod", "connection $i included (",
+				 #$conn->option("host"), ")");
+	      }
+	}
+
+	last if @conn == 0;
+	my $i0 = ZOOM::event(\@conn);
+	last if $i0 == 0;
+	my $i = 1+$idxmap[$i0-1];
 	my $conn = $this->{conn}->[$i-1];
+	die "connection-mapping screwup" if $conn ne $conn[$i0-1];
+
 	my $ev = $conn->last_event();
 	my $evstr = ZOOM::event_str($ev);
 	ZOOM::Log::log("pod", "connection ", $i-1, ": event $ev ($evstr)");