From 3b932bf2afb86d5373c68ada44bb8f5eb642514f Mon Sep 17 00:00:00 2001 From: Dirk Koopman Date: Tue, 12 May 2020 23:26:37 +0100 Subject: [PATCH] Restore Script.pm to master's version --- Changes | 10 +++++++++- perl/Script.pm | 25 ++----------------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/Changes b/Changes index 95ca1a41..1d501d20 100644 --- a/Changes +++ b/Changes @@ -1,6 +1,14 @@ 10May20======================================================================= 1. Added basic changes so that users *could* have multiple connections to the - same node if it is allowed. + same node if it is allowed. This is work in progress and is there to see + if it deals with some networking problems encountered on very high volume + sites which can see more than 1000 users (although the problems can occur + with many hundreds or by the practices of certain ISPs). More information + will be forthcoming if I get to the bottom of what's REALLY going on and + whether this is (or maybe just one part of) the solution. It won't be + ready for general use until then. +2. Fixed the script import error reported by Joaquin (EA3CV?), by the simple + expedient of restoring the version from the master branch. 09May20======================================================================= 1. Show the route by which this PCxx came in progress debugging reports. In some other words: the spot/wwv/wcy/ann message arrived first from this diff --git a/perl/Script.pm b/perl/Script.pm index c18de630..716ee46e 100644 --- a/perl/Script.pm +++ b/perl/Script.pm @@ -22,7 +22,7 @@ my $base = "$main::root/scripts"; sub clean { my $s = shift; - $s =~ s/([-\w\d_]+)/$1/g; + $s =~ s/[^-\w\.]//g; return $s; } @@ -118,26 +118,5 @@ sub lines sub erase { my $self = shift; - my $call = clean($self->{call}); - - my $fn; - my $try; - - $try = "$base/" . clean(lc $self->call); - if (-w $try) { - $fn = $try; - } else { - $try = "$base/" . clean(uc $self->call); - if (-w $try) { - $fn = $try; - } - } - - if ($fn && -w $fn) { - unless (unlink $fn) { - return ($self->msg('m22'. $call)); - } - return ($self->msg('m20', $call)); - } - return ($self->msg('e3', "unset/startup", $call)); + unlink $self->{fn}; } -- 2.43.0