details: http://www.bx.psu.edu/hg/galaxy/rev/bc74a32f875e changeset: 1620:bc74a32f875e user: Nate Coraor <nate@bx.psu.edu> date: Tue Nov 11 10:19:21 2008 -0500 description: Add the "upload" job state to prevent job runner from grabbing upload jobs when tracking in the database. 2 file(s) affected in this change: lib/galaxy/model/__init__.py lib/galaxy/tools/actions/upload.py diffs (22 lines): diff -r 9ce784bcab86 -r bc74a32f875e lib/galaxy/model/__init__.py --- a/lib/galaxy/model/__init__.py Tue Nov 11 09:52:20 2008 -0500 +++ b/lib/galaxy/model/__init__.py Tue Nov 11 10:19:21 2008 -0500 @@ -46,6 +46,7 @@ parameters, and output datasets. """ states = Bunch( NEW = 'new', + UPLOAD = 'upload', WAITING = 'waiting', QUEUED = 'queued', RUNNING = 'running', diff -r 9ce784bcab86 -r bc74a32f875e lib/galaxy/tools/actions/upload.py --- a/lib/galaxy/tools/actions/upload.py Tue Nov 11 09:52:20 2008 -0500 +++ b/lib/galaxy/tools/actions/upload.py Tue Nov 11 10:19:21 2008 -0500 @@ -38,6 +38,7 @@ job.tool_version = tool.version except: job.tool_version = "1.0.0" + job.state = trans.app.model.Job.states.UPLOAD job.flush() log.info( 'tool %s created job id %d' % ( tool.id, job.id ) ) trans.log_event( 'created job id %d' % job.id, tool_id=tool.id )