Commit 26400bb7 authored by Leo Gordon's avatar Leo Gordon
Browse files

moved the call to branch_name_2_code() from HiveGeneric into the DataflowRule object's setter

parent 8ddb8cf4
......@@ -104,8 +104,9 @@ sub new {
sub branch_code {
my $self = shift @_;
if(@_) { # setter mode
$self->{'_branch_code'} = shift @_;
if(@_) {
my $branch_name_or_code = shift @_;
$self->{'_branch_code'} = $branch_name_or_code && Bio::EnsEMBL::Hive::DBSQL::DataflowRuleAdaptor::branch_name_2_code( $branch_name_or_code );
}
return $self->{'_branch_code'};
}
......@@ -136,7 +137,7 @@ sub funnel_dataflow_rule_id {
sub input_id_template {
my $self = shift @_;
if(@_) { # setter mode
if(@_) {
my $input_id_template = shift @_;
$self->{'_input_id_template'} = (ref($input_id_template) ? stringify($input_id_template) : $input_id_template),
}
......
......@@ -691,7 +691,7 @@ sub run {
my $df_rule = Bio::EnsEMBL::Hive::DataflowRule->new(
-from_analysis => $analysis,
-to_analysis_url => $heir_url,
-branch_code => $dataflow_rule_adaptor->branch_name_2_code( $branch_name_or_code ),
-branch_code => $branch_name_or_code,
-input_id_template => $input_id_template,
-funnel_dataflow_rule_id => $funnel_dataflow_rule_id,
);
......
Markdown is supported
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