Changeset 171

Timestamp:

10/10/08 10:45:35 (16 years ago)

Author:

sil

Message:

trunk/src/PBSQuery.py:

• Added a function 'uniq' to class _PBSobject, to be able to filter out unique items in a list of nodes/jobs/...
• Added a function in the job-class to get a list of nodes it's running on

Location:

trunk

Files:

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

trunk/CHANGES

@@ -38 +38 @@
                 * Added to class node the function
                  - get_jobs(self, unique=None)
-                   Returns a list of the currently running job-id('s) on the node. 
-                
-                  Added by: Sil Westerveld <Sil.Westerveld@sara.nl>
+                   Returns a list of the currently running job-id('s) on the node.
+                Added by: Sil Westerveld <Sil.Westerveld@sara.nl>
 
                 * Added get_server_name() function.
                   This will return the PBS-server's name.
-
-                  Added by: Sil Westerveld <Sil.Westerveld@sara.nl>
+                Added by: Sil Westerveld <Sil.Westerveld@sara.nl>
+
+                * Added to class _PBSobject the function
+                  - uniq(self, list)
+                    Filters out unique items of a list.
+                Added by: Sil Westerveld <Sil.Westerveld@sara.nl>
+
+                * Added to class job the function
+                  - get_nodes(self, unique=None)
+                    Returns a list of the nodes which run the job.
+                Added by: Sil Westerveld <Sil.Westerveld@sara.nl>
 
 =========== Version 2.9.4

trunk/src/PBSQuery.py

@@ -238 +238 @@
                         return None
 
+        def uniq(self, list):
+                """Filter out unique items of a list"""
+                uniq_items = {}
+                for item in list:
+                        uniq_items[item] = 1
+                return uniq_items.keys()
+
 class job(_PBSobject):
         """PBS job class""" 
@@ -246 +253 @@
                         return self.TRUE 
 
-        def get_nodes(self):
+        def get_nodes(self, unique=None):
+                """Returns a list of the nodes which run this job"""
                 nodes = self.get_value('exec_host')
                 if nodes:
-                        l = string.split(nodes,'+')
-                        return l
+                        nodelist = string.split(nodes,'+')
+                        if not unique:
+                                return nodelist
+                        else:
+                                return self.uniq(nodelist)
                 return list()
 
@@ -279 +290 @@
                                 return joblist
                         else:
-                                uniq = {}
-                                for job in joblist:
-                                        uniq[job] = 1
-                                return uniq.keys()
+                                return self.uniq(joblist)
                 return list()