From acb40f079d94cad5c5d8de2fb5e93dd16c8664dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20Kusalananda=20K=C3=A4h=C3=A4ri?=
<ak4@sanger.ac.uk>
Date: Thu, 18 Nov 2010 09:04:15 +0000
Subject: [PATCH] More verbose.
Updated regular expression in DB name parsing.
Now allows assembly version to be alphanumeric.
---
.../production_database/scripts/update_database_list.pl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/misc-scripts/production_database/scripts/update_database_list.pl b/misc-scripts/production_database/scripts/update_database_list.pl
index c015447b5a..824c8b4046 100755
--- a/misc-scripts/production_database/scripts/update_database_list.pl
+++ b/misc-scripts/production_database/scripts/update_database_list.pl
@@ -153,7 +153,7 @@ foreach my $server (@servers) {
}
my ( $db_type, $db_assembly, $db_suffix ) = ( $database =~
- /^[a-z]+_[a-z]+_([a-z]+)_[0-9]+_([0-9]+)([a-z]?)$/ );
+ /^[a-z]+_[a-z]+_([a-z]+)_[0-9]+_([0-9a-z]+?)([a-z]?)$/ );
if ( !defined($db_type)
|| !defined($db_assembly)
@@ -161,6 +161,10 @@ foreach my $server (@servers) {
{
die(
sprintf( "Failed to parse database name '%s'", $database ) );
+ } else {
+ printf( "Found '%s' (%s, %s, %s, %s)\n",
+ $database, $species, $db_type,
+ $db_assembly, $db_suffix );
}
$databases{$database} = {
@@ -199,7 +203,7 @@ if ( scalar( keys(%databases) ) == 0 ) {
$sth->bind_param( 1, $db_hash->{'species_id'}, SQL_INTEGER );
$sth->bind_param( 2, $db_hash->{'db_type'}, SQL_VARCHAR );
$sth->bind_param( 3, $release, SQL_INTEGER );
- $sth->bind_param( 4, $db_hash->{'db_assembly'}, SQL_INTEGER );
+ $sth->bind_param( 4, $db_hash->{'db_assembly'}, SQL_VARCHAR );
$sth->bind_param( 5, $db_hash->{'db_suffix'}, SQL_VARCHAR );
$sth->bind_param( 6, $db_hash->{'db_host'}, SQL_VARCHAR );
--
GitLab