337 |
|
rForJ = r |
338 |
|
break |
339 |
|
## Check the submission number and create new running jobs on the client side |
340 |
< |
if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Cleared','Killed','Done','Done (Failed)','Not Submitted']) : |
340 |
> |
if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Cleared','Killed','Done','Done (Failed)','Not Submitted', 'Cancelled by user']) : |
341 |
|
if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1: |
342 |
|
nj_list.append(id) |
343 |
|
if len(nj_list) > 0: self.newRunJobs(nj_list) |
379 |
|
## unsing 'standardInput' field for 'ended' tag ['Y','N'] |
380 |
|
job['standardInput'] = str( rForJ.getAttribute('ended') ) |
381 |
|
|
382 |
< |
## for release > 251 |
383 |
< |
# job.runningJob['state'] = str( rForJ.getAttribute('action') ) |
382 |
> |
job.runningJob['state'] = str( rForJ.getAttribute('action') ) |
383 |
|
|
384 |
|
#if str( rForJ.getAttribute('resubmit') ).isdigit(): |
385 |
|
# job['submissionNumber'] = int(rForJ.getAttribute('resubmit')) |