removed ~ from the end of a PC18

[spider.git] / perl / DXProtout.pm

diff --git a/perl/DXProtout.pm b/perl/DXProtout.pm
index 7afb0e92af1241c134908c04348bbfb857a581d7..6df70ad71d8af1776fe9d95a07df036c467c0dff 100644 (file)
--- a/perl/DXProtout.pm
+++ b/perl/DXProtout.pm
@@ -94,7 +94,7 @@ sub pc17
 sub pc18
 {
        my $info = DXCluster::cluster;
-       return "PC18^$info^$DXProt::myprot_version^~";
+       return "PC18^$info^$DXProt::myprot_version^";
 }
 
 #
@@ -186,7 +186,7 @@ sub pc29
 {
        my ($fromnode, $tonode, $stream, $text) = @_;
        $text =~ s/\^/:/og;                     # remove ^
-       $text =~ s/\~/S/og;
+#      $text =~ s/\~/S/og;
        return "PC29^$fromnode^$tonode^$stream^$text^~";
 }
 
@@ -235,13 +235,7 @@ sub pc35
 # send all the DX clusters I reckon are connected
 sub pc38
 {
-       my @list = DXNode->get_all();
-       my $list;
-       my @nodes;
-  
-       foreach $list (@list) {
-               push @nodes, $list->call;
-       }
+       my @nodes = map { ($_->dxchan && $_->dxchan->isolate) ? () : $_->call } DXNode->get_all();
        return "PC38^" . join(',', @nodes) . "^~";
 }