Changeset 195 for trunk/src

Timestamp:

05/18/09 16:53:34 (15 years ago)

Author:

bas

Message:

src/PBSQuery.py:

• Forgot to port the job,node and queue class functions to new data structure ;-(

File:

• trunk/src/PBSQuery.py (modified) (6 diffs)

trunk/src/PBSQuery.py

@@ -64 +64 @@
 import sys
 import re
+import types
 
 class PBSError(Exception):
@@ -341 +342 @@
                 return uniq_items.keys()
 
+        def return_value(self, key):
+                """Function that returns a value independent of new or old data structure"""
+                if isinstance(self[key], types.ListType):
+                        return self[key][0]
+                else:
+                        return self[key] 
+
 class job(_PBSobject):
         """PBS job class""" 
         def is_running(self):
-                if self.get_value('job_state') == 'Q':
+
+                value = self.return_value('job_state')
+                if value == 'Q':
+                        return self.TRUE 
+                else:
                         return self.FALSE
-                else:
-                        return self.TRUE 
 
         def get_nodes(self, unique=None):
@@ -366 +376 @@
         def is_free(self):
                 """Check if node is free"""
-                if self.get_value('state') == 'free':
+
+                value = self.return_value('state')
+                if value == 'free':
                         return self.TRUE
                 else: 
@@ -373 +385 @@
         def has_job(self):
                 """Does the node run a job"""
-                if self.get_value('jobs'):
+                try:
+                        a = self['jobs']
                         return self.TRUE
-                else:
+                except KeyError, detail:
                         return self.FALSE
         
@@ -393 +406 @@
         """PBS queue class"""
         def is_enabled(self):
-                if self.get_value('enabled') == 'True':
+
+                value = self.return_value('enabled')
+                if value == 'True':
                         return self.TRUE 
                 else:
@@ -399 +414 @@
 
         def is_execution(self):
-                if self.get_value('queue_type') == 'Execution':
+
+                value = self.return_value('queue_type')
+                if value == 'Execution':
                         return self.TRUE 
                 else: