X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=41a95db8086ec106eec66a102ecda92324727497;hb=329702a31bd4a526077c713b12ede457276c79db;hp=04dcb4b2241e4f9042e8fb5ffda691c0d0ded2c7;hpb=97315924f561c56cef3b581691409d4217f5c1b5;p=spider.git diff --git a/perl/Prefix.pm b/perl/Prefix.pm index 04dcb4b2..41a95db8 100644 --- a/perl/Prefix.pm +++ b/perl/Prefix.pm @@ -9,11 +9,10 @@ package Prefix; use IO::File; -use Carp; use DXVars; use DB_File; use Data::Dumper; -use Carp; +use DXDebug; use strict; use vars qw($db %prefix_loc %pre); @@ -150,10 +149,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) {