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.59 by spiga, Tue May 26 10:23:00 2009 UTC vs.
Revision 1.62 by spiga, Fri Jun 12 09:38:54 2009 UTC

# Line 206 | Line 206 | class DBinterface:
206          if server_mode == 1:
207              # init client server params...
208              CliServerParams(self)      
209 <            headerTask= "Task Id = %-40s " %(task['name'])
209 >            headerTask = "Task Id = %-40s\n" %(task['name'])
210 >            headerTask+=  '--------------------------------------------------------------------------------------------\n'
211              displayReport(self,headerTask,lines)
212              common.logger.info(showWebMon(self.server_name))
213          if (jid ) or (server_mode == 0):
# Line 215 | Line 216 | class DBinterface:
216                  common.bossSession.getRunningInstance(job)
217                  toPrint = "%-5s %-50s " % (job['jobId'],job.runningJob['schedulerId'])
218                  lines.append(toPrint)
219 <            header+= "%-5s %-50s " % ('Job:','ID' )
219 >            header+= "%-5s %-50s\n " % ('Job:','ID' )
220 >            header+=  '--------------------------------------------------------------------------------------------\n'
221              displayReport(self,header,lines)
222          return  
223  
# Line 316 | Line 318 | class DBinterface:
318              common.bossSession.getNewRunningInstance(job)
319              job.runningJob['status'] = 'C'
320              job.runningJob['statusScheduler'] = 'Created'
321 +            job.runningJob['state'] = 'Created'
322          common.bossSession.updateDB(task)    
323          return        
324  
# Line 373 | Line 376 | class DBinterface:
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']
377 <                job['standardInput'] = str( rForJ.getAttribute('ended') )
379 >                job['closed'] = str( rForJ.getAttribute('ended') )
380  
381                  job.runningJob['state'] = str( rForJ.getAttribute('action') )
382            
# Line 390 | Line 392 | class DBinterface:
392      # FIXME temporary method to verify what kind of submission to perform towards the server
393      def checkIfNeverSubmittedBefore(self):
394          for j in self.getTask().jobs:
395 <            if j.runningJob['submission'] > 1 or j.runningJob['status'] != 'C' or \
394 <                    j.runningJob['statusScheduler'] != 'Created':
395 >            if j.runningJob['submission'] > 1 or j.runningJob['state'] != 'Created':
396                  return False
397          return True
398  

Diff Legend

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