Commit b54fda77 authored by Leo Gordon's avatar Leo Gordon
Browse files

renamed -input_job_id to -prev_job_id to be in sync with other names

parent 159e56ae
......@@ -57,10 +57,9 @@ use base ('Bio::EnsEMBL::DBSQL::BaseAdaptor');
=head2 CreateNewJob
Args : -input_id => string of input_id which will be passed to run the job (or a Perl hash that will be automagically stringified)
-analysis => Bio::EnsEMBL::Hive::Analysis object from a database
-block => int(0,1) set blocking state of job (default = 0)
-input_job_id => (optional) job_id of job that is creating this
job. Used purely for book keeping.
-analysis => Bio::EnsEMBL::Hive::Analysis object stored in the database
-prev_job_id => (optional) job_id of job that is creating this job.
Used purely for book keeping.
Example : $job_id = Bio::EnsEMBL::Hive::DBSQL::AnalysisJobAdaptor->CreateNewJob(
-input_id => 'my input data',
-analysis => $myAnalysis);
......@@ -80,7 +79,7 @@ sub CreateNewJob {
my ($class, @args) = @_;
my ($input_id, $analysis, $prev_job, $prev_job_id, $semaphore_count, $semaphored_job_id, $push_new_semaphore) =
rearrange([qw(input_id analysis prev_job input_job_id semaphore_count semaphored_job_id push_new_semaphore)], @args);
rearrange([qw(input_id analysis prev_job prev_job_id semaphore_count semaphored_job_id push_new_semaphore)], @args);
throw("must define input_id") unless($input_id);
throw("must define analysis") unless($analysis);
......@@ -88,7 +87,7 @@ sub CreateNewJob {
unless($analysis->isa('Bio::EnsEMBL::Hive::Analysis'));
throw("analysis must have adaptor connected to database")
unless($analysis->adaptor and $analysis->adaptor->db);
throw("Please specify prev_job object instead of input_job_id if available") if ($prev_job_id); # 'obsolete' message
throw("Please specify prev_job object instead of prev_job_id if available") if ($prev_job_id); # 'obsolete' message
$prev_job_id = $prev_job && $prev_job->dbID();
......
......@@ -442,7 +442,7 @@ sub run {
Bio::EnsEMBL::Hive::DBSQL::AnalysisJobAdaptor->CreateNewJob(
-input_id => $input_id_hash, # input_ids are now centrally stringified in the AnalysisJobAdaptor
-analysis => $analysis,
-input_job_id => undef, # these jobs are created by the initialization script, not by another job
-prev_job_id => undef, # these jobs are created by the initialization script, not by another job
);
}
}
......
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