1. Fixed VS6 lat/long in prefix_data and wpxloc.raw

[spider.git] / perl / Prefix.pm

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index dbaa1c8422307656bebb2a85bd56eb7da506ab5c..ae431485a1c4e0369e65c87f4cfaa50c15fdaf23 100644 (file)
--- a/perl/Prefix.pm
+++ b/perl/Prefix.pm
@@ -29,9 +29,11 @@ sub load
        %prefix_loc = ();
   }
   $db = tie(%pre, "DB_File", undef, O_RDWR|O_CREAT, 0666, $DB_BTREE) or confess "can't tie \%pre ($!)";  
-  confess $@ if $@;
-  do "$main::data/prefix_data.pl";
+  my $out = $@ if $@;
+  do "$main::data/prefix_data.pl" if !$out;
+  $out = $@ if $@;
 #  print Data::Dumper->Dump([\%pre, \%prefix_loc], [qw(pre prefix_loc)]);
+  return $out;
 }
 
 sub store
@@ -146,9 +148,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) {