Commit 545c992c authored by Leo Gordon's avatar Leo Gordon
Browse files

check_blocking_control_rules() no longer talks to the adaptor, it gets its...

check_blocking_control_rules() no longer talks to the adaptor, it gets its rules from analysis->control_rules_collection
parent f4027326
......@@ -209,9 +209,8 @@ sub jobs_collection {
sub control_rules_collection {
my $self = shift @_;
$self->{'_control_rules_collection'} = shift if(@_);
return $self->{'_control_rules_collection'} || Bio::EnsEMBL::Hive->collection('AnalysisCtrlRule')->find_all_by('ctrled_analysis', $self);
return Bio::EnsEMBL::Hive->collection('AnalysisCtrlRule')->find_all_by('ctrled_analysis', $self)
|| $self->adaptor->db->get_AnalysisCtrlRuleAdaptor->fetch_all_by_ctrled_analysis_id( $self->dbID );
}
......
......@@ -307,7 +307,7 @@ sub toString {
sub check_blocking_control_rules {
my $self = shift;
my $ctrl_rules = $self->adaptor->db->get_AnalysisCtrlRuleAdaptor->fetch_all_by_ctrled_analysis_id($self->analysis_id);
my $ctrl_rules = $self->analysis->control_rules_collection();
my $all_conditions_satisfied = 1;
......
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