From a3ad0eb521fa056cc644b772500937af23e41700 Mon Sep 17 00:00:00 2001
From: Ian Longden <ianl@sanger.ac.uk>
Date: Thu, 30 Jun 2005 12:37:26 +0000
Subject: [PATCH] merged adaptors removed
---
modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm | 27 +++-----------------------
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm b/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm
index 3e28b9ca0f..7c38d060d6 100755
--- a/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm
+++ b/modules/Bio/EnsEMBL/DBSQL/DBAdaptor.pm
@@ -90,7 +90,6 @@ sub new {
rearrange([qw(SPECIES GROUP DBCONN DNADB)], @args);
if(defined($con)){
-
$self->dbc($con);
}
else{
@@ -100,9 +99,7 @@ sub new {
if(defined($species)){
$self->species($species);
}
-# else{
-# $self->species("DEFAULT");
-# }
+
if(defined($group)){
$self->group($group);
}
@@ -117,19 +114,6 @@ sub new {
}
-sub new_merged{
- my($class, $species, @args) = @_;
-
- my $self ={};
- bless $self,$class;
-
- $self->species($species);
- $self->group("_MERGED_");
-
- return $self;
-}
-
-
=head2 dbc
@@ -688,13 +672,8 @@ sub AUTOLOAD {
throw("Could not work out type for $AUTOLOAD \n");
}
- my $ret = undef;
- if($self->group() eq "_MERGED_"){
- $ret = $reg->get_MergedAdaptor($self->species(),$type);
- }
- else{
- $ret = $reg->get_adaptor($self->species(),$self->group(),$type);
- }
+ my $ret = $reg->get_adaptor($self->species(),$self->group(),$type);
+
if($ret){
return $ret;
}
--
GitLab