From ab75521e9cf4354459926c45c76f7bdd4d09bd73 Mon Sep 17 00:00:00 2001
From: Glenn Proctor <gp1@sanger.ac.uk>
Date: Thu, 16 Dec 2004 12:54:42 +0000
Subject: [PATCH] Fix to bit that figures out which species.pm to use.
---
misc-scripts/xref_mapping/xref_mapper.pl | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/misc-scripts/xref_mapping/xref_mapper.pl b/misc-scripts/xref_mapping/xref_mapper.pl
index 48653c3a37..d74dc89b63 100644
--- a/misc-scripts/xref_mapping/xref_mapper.pl
+++ b/misc-scripts/xref_mapping/xref_mapper.pl
@@ -45,14 +45,16 @@ my @all_species;
my $xref=undef;
my $species=undef;
my $type;
+
while( my $line = <FILE> ) {
+
chomp($line);
next if $line =~ /^#/;
next if !$line;
-# print $line."\n";
+ # print $line."\n";
my ($key, $value) = split("=",$line);
- if($key eq "species"){
+ if($key eq "species"){
$type = "species";
if(defined($species)){
push @all_species, $species;
@@ -62,18 +64,17 @@ while( my $line = <FILE> ) {
my $module;
if($@) {
warn("Could not require mapper module XrefMapper::$value\n" .
- "Using XrefMapper::BasicMapper instead:\n$@");
+ "Using XrefMapper::BasicMapper instead\n");
require XrefMapper::BasicMapper;
$module = "BasicMapper";
- }
- else{
+ } else{
$module = $value;
}
- {
- no strict 'refs';
- $species = "XrefMapper::$module"->new();
- $species->species($value);
- }
+
+ no strict 'refs';
+ $species = "XrefMapper::$module"->new();
+ $species->species($value);
+
if(defined($dumpcheck)){
$species->dumpcheck("yes");
}
--
GitLab