fixed cluster->client regex so the |---| works correctly as data

diff --git a/Changes b/Changes
index af94cb67249f9d57f450d7a8e0782e462b9348bb..7955dafe3923168ab1da978e122d1ac05d73040e 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+21Jun99=======================================================================
+1. changed regex for cluster->client msgs so that strings like |---| are no
+longer ignored.
 20Jun99=======================================================================
 1. prevented a merge to myself (causes a loop)
 18Jun99=======================================================================

diff --git a/perl/client.pl b/perl/client.pl
index fb86542f394dbfdf760d56acb1fe0402c5d0eceb..1914ab3179e53e54365c685a05b1022c95937f05 100755 (executable)
--- a/perl/client.pl
+++ b/perl/client.pl
@@ -98,7 +98,7 @@ sub rec_socket
                cease(1);
        }
        if (defined $msg) {
-               my ($sort, $call, $line) = $msg =~ /^(\w)(\S+)\|(.*)$/;
+               my ($sort, $call, $line) = $msg =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
                
                if ($sort eq 'D') {
                        my $snl = $mynl;

diff --git a/perl/cluster.pl b/perl/cluster.pl
index 94fe0478664473b657b6297b9189ae8e091c1696..d1bc62573a9cd336f1fd33a63228508446ff91d3 100755 (executable)
--- a/perl/cluster.pl
+++ b/perl/cluster.pl
@@ -230,7 +230,7 @@ sub process_inqueue
        
        my $data = $self->{data};
        my $dxchan = $self->{dxchan};
-       my ($sort, $call, $line) = $data =~ /^(\w)(\S+)\|(.*)$/;
+       my ($sort, $call, $line) = $data =~ /^(\w)([A-Z0-9\-]+)\|(.*)$/;
 
        # the above regexp must work
        return unless ($sort && $call && $line);