Changeset 190 for trunk

Timestamp:

05/14/09 13:11:08 (15 years ago)

Author:

bas

Message:

src/PBSQuery.py:

• fixed an error in parsing for new data structure, value can contain a '=' char
• added the iter method

examples/new_interface.py:

• make use of new data structure and iter object

Location:

trunk

Files:

• examples/new_interface.py (modified) (1 diff)
• src/PBSQuery.py (modified) (2 diffs)

trunk/examples/new_interface.py

@@ -16 +16 @@
 
   p = PBSQuery()
-
-  nodes = p.getnodes()
-  for name, node in nodes.items():
-        print node
-        if node.is_free():
-                print "%s : Found an free node" %name
+  p.new_data_structure()
 
   jobs = p.getjobs()
-  for name, job in jobs.items():
-     for key in job.keys():
-        print '%s = %s' %(key, job[key])
- 
+  for id in jobs:
+     print id + ':'
+     for attr in jobs[id]:
+        print '\t' + attr, jobs[id][attr]
+     
   l = ['state', 'np' ]
   nodes = p.getnodes(l)
-  for node in nodes.values():
-     print node
+  for id in nodes:
+     print id + ': ', nodes[id].state, nodes[id].np
+
+     for attrib in nodes[id]:
+        print attrib, nodes[id][attrib]
 
 main()

trunk/src/PBSQuery.py

@@ -180 +180 @@
                                                         new[key] = dict()
                                                         for v in values:
-                                                                a,b = v.split('=')
-                                                                new[key][a] = [ b ]
+                                                                # First argument is the key and the rest is the value 
+                                                                # - value can contain a '='
+                                                                #
+                                                                tmp = v.split('=')
+                                                                new[key][ tmp[0] ] = [ tmp[1:] ]
                                                 
                 self._free(l)
@@ -318 +321 @@
                         error = 'invalid attribute %s' %(name)
                         raise PBSError(error)
+
+        def __iter__(self):
+                return iter(self.data.keys())
 
         def uniq(self, list):