fixed A & K to be right way round

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 1ffbe70193961fd899fb090d5b1e6c744df56ab5..5797c63ff8d3c9d0e801eb49ce082053083cdafd 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -425,7 +425,7 @@ sub normal
                        return if $pcno == 27;
 
                        # broadcast to the eager users
-                       broadcast_users("WWV de $field[7] <$field[2]>:   SFI=$sfi, K=$k, A=$i, $field[6]", 'wwv', $wwv );
+                       broadcast_users("WWV de $field[7] <$field[2]>:   SFI=$sfi, A=$k, K=$i, $field[6]", 'wwv', $wwv );
                        last SWITCH;
                }
                
@@ -692,8 +692,11 @@ sub send_local_config
                @nodes = (DXCluster->get_exact($main::mycall));
        } else {
                # create a list of all the nodes that are not connected to this connection
-               @nodes = DXNode::get_all();
+               # and are not themselves isolated, this to make sure that isolated nodes
+        # don't appear outside of this node
+               @nodes = DXNode::get_all(); 
                @nodes = grep { $_->dxchan != $self } @nodes;
+               @nodes = grep { !($_->dxchan && $_->dxchan->isolate) } @nodes;
        }
 
        my @s = $me->pc19(@nodes);