Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
ensembl-gh-mirror
ensembl
Commits
065d1f39
Commit
065d1f39
authored
Nov 11, 2015
by
Dan Staines
Browse files
added taxonomy adaptor support
parent
1343d1ca
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
1 deletion
+27
-1
modules/Bio/EnsEMBL/Registry.pm
modules/Bio/EnsEMBL/Registry.pm
+27
-1
No files found.
modules/Bio/EnsEMBL/Registry.pm
View file @
065d1f39
...
...
@@ -162,6 +162,7 @@ my %group2adaptor = (
'
pipeline
'
=>
'
Bio::EnsEMBL::Pipeline::DBSQL::DBAdaptor
',
'
production
'
=>
'
Bio::EnsEMBL::Production::DBSQL::DBAdaptor
',
'
stable_ids
'
=>
'
Bio::EnsEMBL::DBSQL::DBAdaptor
',
'
taxonomy
'
=>
'
Bio::EnsEMBL::DBSQL::TaxonomyDBAdaptor
',
'
variation
'
=>
'
Bio::EnsEMBL::Variation::DBSQL::DBAdaptor
',
'
vega
'
=>
'
Bio::EnsEMBL::DBSQL::DBAdaptor
',
'
vega_update
'
=>
'
Bio::EnsEMBL::DBSQL::DBAdaptor
',
...
...
@@ -374,7 +375,6 @@ sub load_all {
$adaptor_args
{'
-no_cache
'}
=
1
;
}
}
if
(
$verbose
)
{
printf
(
"
Configuring adaptor '%s'
"
.
"
for configuration section '%s'...
\n
",
...
...
@@ -1734,6 +1734,8 @@ sub load_registry_from_db {
my
$ontology_db
;
my
$ontology_version
;
my
$taxonomy_db
;
my
$production_dba_ok
=
eval
{
require
Bio::EnsEMBL::Production::DBSQL::
DBAdaptor
;
1
};
my
$production_db
;
...
...
@@ -1804,6 +1806,8 @@ sub load_registry_from_db {
$ontology_db
=
$db
;
$ontology_version
=
$
1
;
}
}
elsif
(
$db
=~
/^ncbi_taxonomy$/
)
{
$taxonomy_db
=
$db
;
}
elsif
(
$production_dba_ok
and
$db
=~
/^ensembl(?:genomes)?_production(_\d+)?/x
)
{
# production db can come with no version (i.e. that on ens-staging1),
# but it's backed up with a release number
...
...
@@ -2305,6 +2309,28 @@ sub load_registry_from_db {
print
("
No ontology database found
\n
");
}
# Taxonomy
if
(
defined
$taxonomy_db
)
{
require
Bio::EnsEMBL::DBSQL::
TaxonomyDBAdaptor
;
my
$dba
=
Bio::EnsEMBL::DBSQL::
TaxonomyDBAdaptor
->
new
(
'
-species
'
=>
'
multi
'
.
$species_suffix
,
'
-group
'
=>
'
taxonomy
',
'
-host
'
=>
$host
,
'
-port
'
=>
$port
,
'
-user
'
=>
$user
,
'
-pass
'
=>
$pass
,
'
-dbname
'
=>
$taxonomy_db
,
);
if
(
$verbose
)
{
printf
(
"
%s loaded
\n
",
$taxonomy_db
);
}
}
elsif
(
$verbose
)
{
print
("
No taxonomy database found
\n
");
}
# Production
if
(
$production_dba_ok
and
defined
(
$production_db
)
&&
!
$ignore_multi
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment