Changeset 245

Timestamp:

08/13/10 15:06:59 (14 years ago)

Author:

bas

Message:

Some improvements on get_jobs for node class

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• src/PBSQuery.py (modified) (1 diff)

trunk/CHANGES

@@ -21 +21 @@
      - fixed and error in get_jobs function for nodes. Did not
        support new data structure and uniq did not work.
-       Authors: Shunjie Lau <eijnuhs at gmail dot com> and Bas van der Vlie
+       Authors: Shunjie Lau <eijnuhs at gmail dot com> and Bas van der Vlies
 
 =========== 4.1.0

trunk/src/PBSQuery.py

@@ -437 +437 @@
                 jobs = self.get_value('jobs')
                 if jobs:        
-                        if type(jobs) == type('string') :
-                                jobs = re.compile('[^\\ /]\\d+[^/.]').findall( jobs )
+                        if isinstance(jobs, str):
+                                jlist = re.compile('[^\\ /]\\d+[^/.]').findall( jobs )
                         
-                        if not unique:
-                                return jobs
+                                if not unique:
+                                        return jlist
+                                else:
+                                        return self.uniq(jlist)
+
                         else:
                                 job_re = re.compile('^(?:\d+/)?(.+)')
                                 l = list()
 
-                                for j in jobs:
-                                    jobstr = job_re.findall(j.strip())[0]
-                                    if jobstr not in l: 
-                                        l.append(jobstr)           
-                                return l
+                                if unique:
+                                                for j in jobs:
+                                                        jobstr = job_re.findall(j.strip())[0]
+                                                if jobstr not in l: 
+                                                        l.append(jobstr)           
+
+                                                return l
+                                else:
+                                                return jobs
 
                 return list()