get all the debugging finally into the debug files when things go wrong

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index 8ea62b87fbda9e742fd0a481b925e753a9b2c65e..41a95db8086ec106eec66a102ecda92324727497 100644 (file)
--- 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) {