remove web or net from the front or rear of prefix callsigns

diff --git a/Changes b/Changes
index 74265c58f62169b9f0c8ee5356fdd7025358033f..c39c735054e70c79eaa944e41836605e1b0f45d8 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,6 @@
 30Aug99=======================================================================
 1. remove -@ as well as \d from SSIDs for spots
+2. remove WEB and/or NET from the front or rear of callsigns in Prefix.pm
 29Aug99=======================================================================
 1. Added msg command to allow the changing of To, From, Subject and so on the
 messages. This seems particularly important just now as a whole raft of G3's

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 04dcb4b2241e4f9042e8fb5ffda691c0d0ded2c7..b71f754e640ee0b18bf441db8ccfc31b2ad9debd 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -150,10 +150,12 @@ sub extract
 
        # remove any /0-9 /P /A /M /MM /AM suffixes etc
        if (@parts > 1) {
+               $p = $parts[0];
+               shift @parts if $p =~ /^(WEB|NET)$/o;
                $p = $parts[$#parts];
-               pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|Q\w+)$/o;
+               pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|WEB|NET|Q\w+)$/o;
                $p = $parts[$#parts];
-               pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|Q\w+)$/o;
+               pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX|WEB|NET|Q\w+)$/o;
   
                # can we resolve them by direct lookup
                foreach $p (@parts) {