X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=41a95db8086ec106eec66a102ecda92324727497;hb=e06d5fa736172c044f769e791c23e7cd05ae3445;hp=8ea62b87fbda9e742fd0a481b925e753a9b2c65e;hpb=ca18864d1264fadfe9869b630f05c950876c2169;p=spider.git diff --git a/perl/Prefix.pm b/perl/Prefix.pm index 8ea62b87..41a95db8 100644 --- a/perl/Prefix.pm +++ b/perl/Prefix.pm @@ -8,11 +8,11 @@ package Prefix; -use Carp; +use IO::File; use DXVars; use DB_File; use Data::Dumper; -use Carp; +use DXDebug; use strict; use vars qw($db %prefix_loc %pre); @@ -40,7 +40,7 @@ sub load sub store { my ($k, $l); - my $fh = new FileHandle; + my $fh = new IO::File; my $fn = "$main::data/prefix_data.pl"; confess "Prefix system not started" if !$db; @@ -149,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) {