Merge branch 'test' into mojo

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 2fab0e0b4f9437812f5737a77034c8b815f36955..d7552cb65f0d712b53ddc34ed017463a67cd8fc4 100644 (file)
--- 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); 
@@ -472,17 +472,17 @@ sub cty_data
 }
 
 my %valid = (
+                        city => '0,City',
+                        cont => '0,Continent',
+                        cq => '0,CQ',
+                        dxcc => '0,DXCC',
+                        itu => '0,ITU',
                         lat => '0,Latitude,slat',
                         long => '0,Longitude,slong',
-                        dxcc => '0,DXCC',
                         name => '0,Name',
-                        itu => '0,ITU',
-                        cq => '0,CQ',
+                        qra => '0,Locator',
                         state => '0,State',
-                        city => '0,City',
                         utcoff => '0,UTC offset',
-                        cont => '0,Continent',
-                        qra => '0,Locator',
                        );
 
 sub AUTOLOAD