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.47 by mcinquil, Tue Sep 30 22:16:46 2008 UTC vs.
Revision 1.53 by mcinquil, Thu Feb 5 15:44:02 2009 UTC

# Line 207 | Line 207 | class DBinterface:
207          lines=[]
208          task = self.getTask()
209          if server_mode == 1:
210 +            # init client server params...
211 +            CliServerParams(self)      
212              headerTask= "Task Id = %-40s " %(task['name'])
213              displayReport(self,headerTask,lines)
214 +            common.logger.message(showWebMon(self.server_name))
215          if (jid ) or (server_mode == 0):
216              for job in task.jobs:
217                  toPrint=''
# Line 333 | Line 336 | class DBinterface:
336                  if r.getAttribute('id') in [ id, 'all']:
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 ['Killed','Done']) :
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']) :
341                  if int(job.runningJob['submission']) < int(rForJ.getAttribute('resubmit')) + 1:
342                      nj_list.append(id)
343 <                    self.newRunJobs(nj_list)
343 >            if len(nj_list) > 0: self.newRunJobs(nj_list)
344  
345          task_new = self.getTask()
346  
# Line 348 | Line 351 | class DBinterface:
351              for r in reportList:
352                  if r.getAttribute('id') in [ id, 'all']:
353                      rForJ = r
354 <                    break
354 >                    break
355                    
356              # Data alignment
357              if rForJ.getAttribute('status') not in ['Created', 'Unknown']:
# Line 372 | Line 375 | class DBinterface:
375                
376                  job.runningJob['wrapperReturnCode'] = str( rForJ.getAttribute('job_exit') )
377                  job_exit_code = str(job.runningJob['wrapperReturnCode'])
378 +
379 +                ## unsing 'standardInput' field for 'ended' tag ['Y','N']
380 +                job['standardInput'] = str( rForJ.getAttribute('ended') )
381            
382              #if str( rForJ.getAttribute('resubmit') ).isdigit():
383              #    job['submissionNumber'] = int(rForJ.getAttribute('resubmit'))

Diff Legend

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