ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CRAB/python/DBinterface.py
(Generate patch)

Comparing COMP/CRAB/python/DBinterface.py (file contents):
Revision 1.68 by farinafa, Wed Feb 24 11:12:34 2010 UTC vs.
Revision 1.69 by farinafa, Fri Feb 26 17:44:57 2010 UTC

# Line 350 | Line 350 | class DBinterface:
350                  if r.getAttribute('id') in [ id, 'all']:
351                      rForJ = r
352                      break
353 +
354 +            # check if rForJ is None
355 +            if rForJ is None:
356 +                common.logger.debug( "Missing XML element for job %s, skip update status"%str(id) )
357 +                continue
358 +            
359              ## Check the submission number and create new running jobs on the client side
360              if rForJ.getAttribute('resubmit') != 'None' and (rForJ.getAttribute('status') not in ['Cleared','Killed','Done','Done (Failed)','Not Submitted', 'Cancelled by user']) :
361                  if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
# Line 394 | Line 400 | class DBinterface:
400  
401                  job.runningJob['state'] = str( rForJ.getAttribute('action') )
402            
403 <                # Needed for unique naming of the output    
404 <                #job.runningJob['submission'] =  int(rForJ.getAttribute('submission'))
403 >                # Needed for unique naming of the output.
404 >                # GIVES PROBLEMS. FIX in >=2_7_2    
405 >                #job.runningJob['submission'] =  str(rForJ.getAttribute('submission'))
406            
407          common.bossSession.updateDB( task_new )
408          return

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines