From 4158ee0833a2da9a433fa677077c36790a5f2f01 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 25 Aug 2009 11:53:42 -0400 Subject: [PATCH] set job state to new in upload tool action so that track_jobs_in_database works --- lib/galaxy/tools/actions/upload.py | 1 + tools/data_source/upload.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/galaxy/tools/actions/upload.py b/lib/galaxy/tools/actions/upload.py index 58feee94b0b..ec5338d579e 100644 --- a/lib/galaxy/tools/actions/upload.py +++ b/lib/galaxy/tools/actions/upload.py @@ -144,6 +144,7 @@ class UploadToolAction( ToolAction ): 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 --git a/tools/data_source/upload.py b/tools/data_source/upload.py index ef1dd214215..5b40b28ddd9 100644 --- a/tools/data_source/upload.py +++ b/tools/data_source/upload.py @@ -206,6 +206,8 @@ def add_file( dataset, json_file ): 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