Changeset 240 for trunk

Timestamp:

05/20/10 11:14:25 (14 years ago)

Author:

bas

Message:

Some fixes, but there is room for improvement

Location:

trunk

Files:

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

trunk/CHANGES

@@ +1 @@
+=========== 4.1.2
+ * examples/new_rack_pbsmon.py now uses the new PBSQuery data 
+   structure.
+   Author: Bas van der Vlies
+
+ * PBSQuery:
+     - 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
+
 =========== 4.1.0
  * Delete function pbs.version() replaced by

trunk/debian/changelog

@@ +1 @@
+pbs-python (4.1.2-1) lenny; urgency=low
+
+  * See changes not yes finishedm but some important fixes 
+
+ -- bas van der Vlies <basv@sara.nl>  Thu, 20 May 2010 11:11:21 +0200
+
 pbs-python (4.1.0-1) lenny; urgency=low
 

trunk/src/PBSQuery.py

@@ -418 +418 @@
         def get_jobs(self, unique=None):
                 """Returns a list of the currently running job-id('s) on the node"""
-                jobstring = self.get_value('jobs')
-                if jobstring:
-                        joblist = re.compile('[^\\ /]\\d+[^/.]').findall( jobstring )
+
+                jobs = self.get_value('jobs')
+                if jobs:        
+                        if type(jobs) == type('string') :
+                                jobs = re.compile('[^\\ /]\\d+[^/.]').findall( jobs )
+                        
                         if not unique:
-                                return joblist
+                                return jobs
                         else:
-                                return self.uniq(joblist)
+                                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
+
                 return list()