From 96f67f30b496aafcb4276f9fe9cf0fa9f572318b Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Sat, 4 Feb 2023 12:13:47 +0000 Subject: [PATCH] fix search terms starting with \d+ in sh/log etc --- Changes | 4 ++++ cmd/show/chat.pl | 4 ++-- cmd/show/log.pl | 2 +- cmd/show/rcmd.pl | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Changes b/Changes index a42d8e28..3ed25f8b 100644 --- a/Changes +++ b/Changes @@ -1,3 +1,7 @@ +04Feb23======================================================================= +1. Fixed sh/log so that callsigns beginning with a digit (or several) are + printed rather than being ignored. + This affects: show/ann, chat, log, rcmd and wx 03Feb23======================================================================= 1. Fix is_ipaddr to accept trailing '::' on IPV6 addresses. 2. Fix and extend the TEST program 'showdx' so that it now works on the mojo diff --git a/cmd/show/chat.pl b/cmd/show/chat.pl index 6e209e25..6b01d206 100644 --- a/cmd/show/chat.pl +++ b/cmd/show/chat.pl @@ -1,7 +1,7 @@ # # print out the general log file for chat only # -# Copyright (c) 1998-2003 - Dirk Koopman G1TLH +# Copyright (c) 1998-2023 - Dirk Koopman G1TLH # # # @@ -28,7 +28,7 @@ while ($f = shift @f) { # next field next if $to; } next if $who; - if ($f !~ /^\d+/) { + if ($f !~ /^\d+$/) { ($who) = $f; } # ($who) = $f =~ /^(\w+)/o; diff --git a/cmd/show/log.pl b/cmd/show/log.pl index ec84daa0..2abe8257 100644 --- a/cmd/show/log.pl +++ b/cmd/show/log.pl @@ -27,7 +27,7 @@ sub handle ($to) = $f =~ /^(\d+)$/ if !$to; # is it a to count? next if $to; } - unless ($f =~ /^\d+/) { + unless ($f =~ /^\d+$/) { $who = $f; next if $who; } diff --git a/cmd/show/rcmd.pl b/cmd/show/rcmd.pl index 0a362075..df64298b 100644 --- a/cmd/show/rcmd.pl +++ b/cmd/show/rcmd.pl @@ -27,7 +27,7 @@ while ($f = shift @f) { # next field next if $to; } next if $who; - if ($f !~ /^\d+/) { + if ($f !~ /^\d+$/) { ($who) = $f; } } -- 2.34.1