X-Git-Url: http://gb7djk.dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FPrefix.pm;h=441cd80ad8c21406ff5cd2d8fe1eddd6459b0815;hb=cce345b95c555a0b45218c5b452bc0f5f4f13bab;hp=d4ed48b33dbcf0fa7e8fd8e6daf9339c53cae900;hpb=bdfc958f3d0fa912d20a020ac1a6cd2c79a22729;p=spider.git diff --git a/perl/Prefix.pm b/perl/Prefix.pm index d4ed48b3..441cd80a 100644 --- 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|Q\w+)$/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|Q\w+)$/o; # can we resolve them by direct lookup foreach $p (@parts) {