details: http://www.bx.psu.edu/hg/galaxy/rev/d0fb5c640d43 changeset: 2621:d0fb5c640d43 user: Nate Coraor <nate@bx.psu.edu> date: Tue Aug 25 11:53:42 2009 -0400 description: set job state to new in upload tool action so that track_jobs_in_database works 2 file(s) affected in this change: lib/galaxy/tools/actions/upload.py tools/data_source/upload.py diffs (23 lines): diff -r 899a830754a3 -r d0fb5c640d43 lib/galaxy/tools/actions/upload.py --- a/lib/galaxy/tools/actions/upload.py Mon Aug 24 16:38:24 2009 -0400 +++ b/lib/galaxy/tools/actions/upload.py Tue Aug 25 11:53:42 2009 -0400 @@ -144,6 +144,7 @@ job.add_parameter( 'paramfile', to_json_string( json_file_path ) ) for i, dataset in enumerate( data_list ): job.add_output_dataset( i, dataset ) + job.state = trans.app.model.Job.states.NEW trans.app.model.flush() # Queue the job for execution diff -r 899a830754a3 -r d0fb5c640d43 tools/data_source/upload.py --- a/tools/data_source/upload.py Mon Aug 24 16:38:24 2009 -0400 +++ b/tools/data_source/upload.py Tue Aug 25 11:53:42 2009 -0400 @@ -206,6 +206,8 @@ elif ext == 'scf' and dataset.file_type != 'scf': file_err( "You must manually set the 'File Format' to 'Scf' when uploading scf files.", dataset, json_file ) return + else: + ext = 'binary' data_type = 'binary' if not data_type: # We must have a text file