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.11 by spiga, Wed Mar 26 14:05:52 2008 UTC vs.
Revision 1.12 by spiga, Mon Mar 31 09:23:55 2008 UTC

# Line 46 | Line 46 | class DBinterface:
46          Return task with all/list of jobs
47          """
48  
49 <        if jobsList == 'all':
50 <            task = common.bossSession.load(1)[0]
51 <        else:
52 <            if len(jobsList)>1: str_jobs=string.join(map(str,jobsList),",")
53 <            else: str_jobs=str(jobsList)  
54 <            task = common.bossSession.load(1,jobsList)[0]
49 >        task = common.bossSession.load(1,jobsList)[0]
50          return task
51  
52      def getJob(self, n):
# Line 106 | Line 101 | class DBinterface:
101          """
102          Update Job fields  
103          """
109 –        if len(jobsL)>1: str_jobs=string.join(map(str,jobsL),",")
110 –        else: str_jobs=str(jobsL)
104          task = common.bossSession.load(1,jobsL)[0]
105          id =0
106          for job in task.jobs:
# Line 121 | Line 114 | class DBinterface:
114          """
115          Update Running Job fields  
116          """
124 –        if len(jobsL)>1: str_jobs=string.join(map(str,jobsL),",")
125 –        else: str_jobs=str(jobsL)
117          task = common.bossSession.load(1,jobsL)[0]
118 +        id=0
119          for job in task.jobs:
120              common.bossSession.getRunningInstance(job)
121 <            for key in optsToSave.keys():
122 <                job.runningJob[key] = optsToSave[key]
121 >            for key in optsToSave[id].keys():
122 >                job.runningJob[key] = optsToSave[id][key]
123 >            id+=1
124          common.bossSession.updateDB( task )
125          return
126  
# Line 168 | Line 161 | class DBinterface:
161  
162      def serializeTask(self, tmp_task = None):
163          if tmp_task is None:
171 –            #tmp_task = common.bossSession.loadTaskByID(1)
164              tmp_task = common.bossSession.load(1)[0]
165          return common.bossSession.serialize(tmp_task)  
166  
# Line 199 | Line 191 | class DBinterface:
191          task = common.bossSession.loadTask(1)
192          return task[attr]
193  
194 <    def queryJob(self, attr, jobs):
194 >    def queryJob(self, attr, jobsL):
195          '''
196          Perform a query for a range/all/single job
197          over a generic job attribute
198          '''
199          lines=[]
200 <        str_jobs=string.join(map(str,jobs),",")
209 <        task = common.bossSession.load(1,str_jobs)[0]
200 >        task = common.bossSession.load(1,jobsL)[0]
201          for job in task.jobs:
202              lines.append(eval(job[attr]))
203          return lines
204  
205 <    def queryRunJob(self, attr, jobs):
205 >    def queryRunJob(self, attr, jobsL):
206          '''
207          Perform a query for a range/all/single job
208          over a generic job attribute
209          '''
210          lines=[]
211 <        str_jobs=string.join(map(str,jobs),",")
221 <        task = common.bossSession.load(1,str_jobs)[0]
211 >        task = common.bossSession.load(1,jobsL)[0]
212          for job in task.jobs:
213              common.bossSession.getRunningInstance(job)
214              lines.append(job.runningJob[attr])

Diff Legend

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