a mostly working send message implementation

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index d4ed48b33dbcf0fa7e8fd8e6daf9339c53cae900..dbaa1c8422307656bebb2a85bd56eb7da506ab5c 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -12,13 +12,14 @@ use Carp;
 use DXVars;
 use DB_File;
 use Data::Dumper;
+use Carp;
 
 use strict;
 use vars qw($db  %prefix_loc %pre);
 
-local $db;     # the DB_File handle
-local %prefix_loc;   # the meat of the info
-local %pre;       # the prefix list
+$db;     # the DB_File handle
+%prefix_loc;   # the meat of the info
+%pre;       # the prefix list
 
 sub load
 {
@@ -145,9 +146,9 @@ sub extract
   # remove any /0-9 /P /A /M /MM /AM suffixes etc
   if (@parts > 1) {
     $p = $parts[$#parts];
-       pop @parts if $p =~ /^\d+|[PABM]|AM|MM|BCN|SIX$/o;
+       pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX)$/o;
     $p = $parts[$#parts];
-       pop @parts if $p =~ /^\d+|[PABM]|AM|MM|BCN|SIX$/o;
+       pop @parts if $p =~ /^(\d+|[PABM]|AM|MM|BCN|SIX)$/o;
   
     # can we resolve them by direct lookup
        foreach $p (@parts) {