From 75bb627e525bc813b1016a70cae15282faae8c26 Mon Sep 17 00:00:00 2001 From: djk Date: Mon, 21 Jun 1999 08:13:59 +0000 Subject: [PATCH] fixed cluster->client regex so the |---| works correctly as data --- Changes | 3 +++ perl/client.pl | 2 +- perl/cluster.pl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Changes b/Changes index af94cb67..7955dafe 100644 --- 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 fb86542f..1914ab31 100755 --- 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 94fe0478..d1bc6257 100755 --- 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); -- 2.34.1