X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FPrefix.pm;h=ae431485a1c4e0369e65c87f4cfaa50c15fdaf23;hb=bd23bedbdb72ae107893f94c7eabcfe18867fb41;hp=dbaa1c8422307656bebb2a85bd56eb7da506ab5c;hpb=57b5e464bc44ae8eee23ab94c1f499f527595dc9;p=spider.git

diff --git a/perl/Prefix.pm b/perl/Prefix.pm
index dbaa1c84..ae431485 100644
--- 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) {