From: djk <djk>
Date: Sun, 29 Aug 1999 22:17:46 +0000 (+0000)
Subject: remove web or net from the front or rear of prefix callsigns
X-Git-Tag: R_1_32~25
X-Git-Url: http://dxspider.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=e4df86158dd5138a1fea25dd693b67fd9d78fb56;p=spider.git

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

diff --git a/Changes b/Changes
index 74265c58..c39c7350 100644
--- 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 04dcb4b2..b71f754e 100644
--- 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) {