diff --git a/job.py b/job.py index 158419b..5536eab 100644 --- a/job.py +++ b/job.py @@ -38,8 +38,6 @@ class Job(db.Model): last_update = db.Column(db.DateTime(timezone=True)) name = db.Column(db.String) state = db.Column(db.String) - num_passes = db.Column(db.Integer) - current_pass = db.Column(db.Integer) num_files = db.Column(db.Integer) current_file_num = db.Column(db.Integer) current_file = db.Column(db.String) @@ -50,7 +48,7 @@ class Job(db.Model): logs = db.relationship( "Joblog") def __repr__(self): - return "".format(self.id, self.start_time, self.last_update, self.name, self.state, self.num_passes, self.current_pass, self.num_files, self.current_file_num, self.current_file, self.pa_job_state, self.wait_for, self.extra, self.logs) + return "".format(self.id, self.start_time, self.last_update, self.name, self.state, self.num_files, self.current_file_num, self.current_file, self.pa_job_state, self.wait_for, self.extra, self.logs) ################################################################################ @@ -75,9 +73,9 @@ def WakePAJobManager(): # NewJob takes a name (which will be matched in pa_job_manager.py to run # the appropriate job - which will update the Job() until complete ############################################################################### -def NewJob(name, num_passes="1", num_files="0", wait_for=None ): - job=Job(start_time='now()', last_update='now()', name=name, state="New", num_passes=num_passes, num_files=num_files, - current_pass=0, current_file_num=0, current_file='', +def NewJob(name, num_files="0", wait_for=None ): + job=Job(start_time='now()', last_update='now()', name=name, state="New", num_files=num_files, + current_file_num=0, current_file='', wait_for=wait_for, pa_job_state="New" ) db.session.add(job) db.session.commit()