From f2c4ce315a637ae022ce70e6f7f83dd88515f7a2 Mon Sep 17 00:00:00 2001
From: Magali Ruffier <mr6@ebi.ac.uk>
Date: Thu, 9 Aug 2012 10:34:54 +0000
Subject: [PATCH] look for pre dbtype only if dbtype is defined
---
.../scripts/populate_analysis_description.pl | 39 ++++++++++---------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/misc-scripts/production_database/scripts/populate_analysis_description.pl b/misc-scripts/production_database/scripts/populate_analysis_description.pl
index dff63ac4f9..601ad5457b 100755
--- a/misc-scripts/production_database/scripts/populate_analysis_description.pl
+++ b/misc-scripts/production_database/scripts/populate_analysis_description.pl
@@ -172,26 +172,27 @@ my %data;
$data{$full_db_name}{$logic_name} = { %{ \%hash } };
}
- if ($dbtype eq 'pre') {
- my $sth =
- $dbh->prepare( 'SELECT db_name, logic_name, '
- . 'description, display_label, displayable, data '
- . 'FROM analysis_description ad, species s, analysis_web_data aw '
- . 'LEFT JOIN web_data wd '
- . 'ON wd.web_data_id = aw.web_data_id '
- . 'WHERE ad.analysis_description_id = aw.analysis_description_id AND '
- . 'aw.species_id = s.species_id AND '
- . 'aw.db_type = "' . $dbtype . '" AND '
- . 'db_name =?' );
- $sth->execute($species) ;
- my ( $db_name, $logic_name, %hash) ;
- $sth->bind_columns( \( $db_name, $logic_name,
- $hash{'description'}, $hash{'display_label'},
- $hash{'displayable'}, $hash{'web_data'} ) );
- while ( $sth->fetch() ) {
- $data{$db_name}{$logic_name} = { %{ \%hash } };
+ if (defined $dbtype) {
+ if ($dbtype eq 'pre') {
+ my $sth =
+ $dbh->prepare( 'SELECT db_name, logic_name, '
+ . 'description, display_label, displayable, data '
+ . 'FROM analysis_description ad, species s, analysis_web_data aw '
+ . 'LEFT JOIN web_data wd '
+ . 'ON wd.web_data_id = aw.web_data_id '
+ . 'WHERE ad.analysis_description_id = aw.analysis_description_id AND '
+ . 'aw.species_id = s.species_id AND '
+ . 'aw.db_type = "' . $dbtype . '" AND '
+ . 'db_name =?' );
+ $sth->execute($species) ;
+ my ( $db_name, $logic_name, %hash) ;
+ $sth->bind_columns( \( $db_name, $logic_name,
+ $hash{'description'}, $hash{'display_label'},
+ $hash{'displayable'}, $hash{'web_data'} ) );
+ while ( $sth->fetch() ) {
+ $data{$db_name}{$logic_name} = { %{ \%hash } };
+ }
}
-
}
--
GitLab