Skip to content
Snippets Groups Projects
Commit f2c4ce31 authored by Magali Ruffier's avatar Magali Ruffier
Browse files

look for pre dbtype only if dbtype is defined

parent d46a4dbb
No related branches found
No related tags found
No related merge requests found
...@@ -172,26 +172,27 @@ my %data; ...@@ -172,26 +172,27 @@ my %data;
$data{$full_db_name}{$logic_name} = { %{ \%hash } }; $data{$full_db_name}{$logic_name} = { %{ \%hash } };
} }
if ($dbtype eq 'pre') { if (defined $dbtype) {
my $sth = if ($dbtype eq 'pre') {
$dbh->prepare( 'SELECT db_name, logic_name, ' my $sth =
. 'description, display_label, displayable, data ' $dbh->prepare( 'SELECT db_name, logic_name, '
. 'FROM analysis_description ad, species s, analysis_web_data aw ' . 'description, display_label, displayable, data '
. 'LEFT JOIN web_data wd ' . 'FROM analysis_description ad, species s, analysis_web_data aw '
. 'ON wd.web_data_id = aw.web_data_id ' . 'LEFT JOIN web_data wd '
. 'WHERE ad.analysis_description_id = aw.analysis_description_id AND ' . 'ON wd.web_data_id = aw.web_data_id '
. 'aw.species_id = s.species_id AND ' . 'WHERE ad.analysis_description_id = aw.analysis_description_id AND '
. 'aw.db_type = "' . $dbtype . '" AND ' . 'aw.species_id = s.species_id AND '
. 'db_name =?' ); . 'aw.db_type = "' . $dbtype . '" AND '
$sth->execute($species) ; . 'db_name =?' );
my ( $db_name, $logic_name, %hash) ; $sth->execute($species) ;
$sth->bind_columns( \( $db_name, $logic_name, my ( $db_name, $logic_name, %hash) ;
$hash{'description'}, $hash{'display_label'}, $sth->bind_columns( \( $db_name, $logic_name,
$hash{'displayable'}, $hash{'web_data'} ) ); $hash{'description'}, $hash{'display_label'},
while ( $sth->fetch() ) { $hash{'displayable'}, $hash{'web_data'} ) );
$data{$db_name}{$logic_name} = { %{ \%hash } }; while ( $sth->fetch() ) {
$data{$db_name}{$logic_name} = { %{ \%hash } };
}
} }
} }
......
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