Changeset 175 for trunk

Timestamp:

10/15/08 14:14:34 (16 years ago)

Author:

sil

Message:

trunk/src/PBSQuery.py:

• Cleaned up some old lines of code which didn't do anything.
• Changed the returnvalue of getqueue, getnode and getjob. Now they return an instance of the object, instead of a dict.
• Now the getnode-function accepts the short name as well as the long name as an argument.

Location:

trunk

Files:

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

trunk/CHANGES

@@ +1 @@
+=========== 3.0.0
+        - PBSQuery
+                * Cleaned up some old lines of code which didn't do anything.
+                * Changed the returnvalue of getqueue, getnode and getjob. Now
+                  they return an instance of the object, instead of a dict.
+                * Now the getnode-function accepts the short name as well as
+                  the long name as an argument.
+
+                By: Sil Westerveld <Sil.Westerveld@sara.nl>
+
 =========== 2.9.8 
         - pbs_python.spec file patch added libdir and python defines so it 

trunk/src/PBSQuery.py

@@ -141 +141 @@
                 self._disconnect() 
                 
-                self.serverinfo = {}
                 self._list_2_dict(serverinfo, server)
 
@@ -164 +163 @@
                 self._statqueue(name, attrib_list)
                 q_attrs = self.d['q_express']
-                return self.d
+                return self.d[name]
         
         def getqueues(self, attrib_list=None):
@@ -184 +183 @@
                 self._disconnect() 
                 
-                self.nodes = {}
                 self._list_2_dict(nodes, node)
 
         def getnode(self, name, attrib_list=None):
                 self._statnode(name, attrib_list)
-                return self.d
+                return self.d[name]
         
         def getnodes(self, attrib_list=None):
@@ -210 +208 @@
                 self._disconnect() 
                 
-                self.jobs = {}
                 self._list_2_dict(jobs, job)
 
         def getjob(self, name, attrib_list=None):
+                # To make sure we use the full name of a job; Changes a name
+                # like 1234567 into 1234567.server.name 
+                name = name.split('.')[0] + "." + self.get_server_name()
+
                 self._statjob(name, attrib_list)
-                return self.d
+                return self.d[name]
         
         def getjobs(self, attrib_list=None):