diff --git a/modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm b/modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm index 87ca2c7dd7923a95d7284a5c07900bce14e5e58e..44efd1b38ef8512ca50c2753420f9a0776435c7b 100644 --- a/modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm +++ b/modules/Bio/EnsEMBL/Hive/PipeConfig/HiveGeneric_conf.pm @@ -432,7 +432,7 @@ sub run { $dataflow_rule_adaptor->create_rule( $analysis, $heir_analysis || $heir_url, $branch_code, $input_id_template); - warn "Created DataFlow rule: [$branch_code] $logic_name -> $heir_url (". ($heir_analysis ? 'checked' : 'UNCHECKED') .')' + warn "Created DataFlow rule: [$branch_code] $logic_name -> $heir_url" .($input_id_template ? ' WITH TEMPLATE: '.stringify($input_id_template) : '')."\n"; } } diff --git a/modules/Bio/EnsEMBL/Hive/URLFactory.pm b/modules/Bio/EnsEMBL/Hive/URLFactory.pm index 0c4905723fb372e428c99dc2278ff6dc635b3ab5..c2a36a9fbfbb202597a7155b192e21dee584fa7b 100755 --- a/modules/Bio/EnsEMBL/Hive/URLFactory.pm +++ b/modules/Bio/EnsEMBL/Hive/URLFactory.pm @@ -87,7 +87,7 @@ sub fetch { Bio::EnsEMBL::Hive::URLFactory->new(); # make sure global instance is created if( my ($conn, $user, $pass, $host, $port, $dbname, $table_name, $tparam_name, $tparam_value, %conn_param) = - $url =~ m{^(mysql://(?:(\w+)(?:\:([^/\@]+))?\@)?(?:([\w-\.]+)(?:\:(\d+))?)?/(\w*))(?:/(\w+)(?:\?(\w+)=(\w+))?)?(;(\w+)=(\w+))*$} ) { + $url =~ m{^(mysql://(?:(\w+)(?:\:([^/\@]+))?\@)?(?:([\w\-\.]+)(?:\:(\d+))?)?/(\w*))(?:/(\w+)(?:\?(\w+)=(\w+))?)?(;(\w+)=(\w+))*$} ) { # warn "URLPARSER: conn='$conn', user='$user', pass='$pass', host='$host', port='$port', dbname='$dbname', table_name='$table_name', tparam_name='$tparam_name', tparam_value='$tparam_value'";