Commit 6af98df7 authored by Andreas Kusalananda Kähäri's avatar Andreas Kusalananda Kähäri
Browse files

Patch from Any Yates to get multi-species database to be picked up properly.

parent 00c13edc
......@@ -1406,8 +1406,8 @@ sub load_registry_from_db {
}
for my $db (@dbnames) {
if ( $db =~ /^(\w+)_(collection_\w+_(?:\d+_)?(\d+)_(\w+))/ )
{ # NEEDS TO BE FIRST
if ( $db =~ /^(\w+_collection_\w+(?:_\d+)?)_((\d+)_\w+)/ )
{ # NEEDS TO BE FIRST TO PICK UP COLLECTION DBS
if ( $3 eq $software_version ) {
$temp{$1} = $2;
}
......@@ -1736,8 +1736,10 @@ sub load_registry_from_db {
$sth->bind_columns( \( $species_id, $species ) );
while ( $sth->fetch() ) {
# Get the Core DB & assume this is the required DNADB
my $dnadb = $self->get_DBAdaptor( $species, 'core' );
my $dba = Bio::EnsEMBL::Funcgen::DBSQL::DBAdaptor->new(
-group => "funcgen",
-group => 'funcgen',
-species => $species,
-species_id => $species_id,
-multispecies_db => 1,
......@@ -1747,7 +1749,8 @@ sub load_registry_from_db {
-port => $port,
-dbname => $multidb,
-wait_timeout => $wait_timeout,
-no_cache => $no_cache
-no_cache => $no_cache,
-DNADB => $dnadb
);
if ($verbose) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment