From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 22 Mar 2024 17:26:43 +0000 (+0000)
Subject: Change callsign suffix handling somewhat
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=3f7f9d8e9e296c4598239f15b8014311d0ba7343;p=spider.git

Change callsign suffix handling somewhat
---

diff --git a/Changes b/Changes
index ef87e440..3b892003 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+22Mar24======================================================================
+1. Change the processing of trailing callsigns slightly so that /1 /2 etc are
+   retained, but the /P /M /A /MM etc are removed.
 20Mar24======================================================================
 1. Has it really been so long since the last update?
 2. Since forever, mainly because filtering was done very early on in
diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 83b0ac40..d7552cb6 100644
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -274,7 +274,7 @@ LM:	foreach $call (split /,/, $calls) {
 
 		# remove any /0-9 /P /A /M /MM /AM suffixes etc
 		if (@parts > 1) {
-			@parts = grep { !/^\d+$/ && !/^[PABM]$/ && !/^(?:|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/; } @parts;
+			pop @parts if $parts[-1] =~ /^(?:[PABM]|AM|MM|BCN|JOTA|SIX|WEB|NET|Q\w+)$/;
 
 			# can we resolve them by direct lookup
 			my $s = join('/', @parts);