details: http://www.bx.psu.edu/hg/galaxy/rev/b83da0b74595 changeset: 1676:b83da0b74595 user: guru date: Wed Dec 17 12:13:38 2008 -0500 description: speed enhancement for incorrect_gops_jobs script.

1 file(s) affected in this change:

scripts/others/incorrect_gops_jobs.py

diffs (30 lines):

diff -r 3a9c9da987a2 -r b83da0b74595 scripts/others/incorrect_gops_jobs.py --- a/scripts/others/incorrect_gops_jobs.py Wed Dec 17 11:25:35 2008 -0500 +++ b/scripts/others/incorrect_gops_jobs.py Wed Dec 17 12:13:38 2008 -0500 @@ -42,13 +42,19 @@ try: for job in app.model.Job.filter( sa.and_( app.model.Job.table.c.create_time.between( '2008-05-23', '2008-11-29' ), app.model.Job.table.c.state == 'ok', - sa.or_( app.model.Job.table.c.tool_id == 'gops_intersect_1', - app.model.Job.table.c.tool_id == 'gops_subtract_1', - app.model.Job.table.c.tool_id == 'gops_merge_1', - app.model.Job.table.c.tool_id == 'gops_coverage_1', - app.model.Job.table.c.tool_id == 'gops_complement_1', - ), - sa.not_( app.model.Job.table.c.command_line.like( '%-2 1,2,3%' ) ) + sa.or_( + sa.and_( sa.or_( app.model.Job.table.c.tool_id == 'gops_intersect_1', + app.model.Job.table.c.tool_id == 'gops_subtract_1', + app.model.Job.table.c.tool_id == 'gops_coverage_1', + ), + sa.not_( app.model.Job.table.c.command_line.like( '%-2 1,2,3%' ) ) + ), + sa.and_( sa.or_( app.model.Job.table.c.tool_id == 'gops_complement_1', + app.model.Job.table.c.tool_id == 'gops_merge_1', + ), + sa.not_( app.model.Job.table.c.command_line.like( '%-1 1,2,3%' ) ) + ) + ) ) ).all(): print "# processing job id %s" % str( job.id )