did some work on the cluster database related things

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index d4ed48b33dbcf0fa7e8fd8e6daf9339c53cae900..5f23fce952174d9719a70c8f07db9ea9111754fc 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -16,9 +16,9 @@ use Data::Dumper;
 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 +145,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) {