Changeset 86 for trunk

Timestamp:

04/18/05 14:40:58 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Rewrote node adding to jobs
• Misc cleanup

File:

• trunk/daemon/togad.py (modified) (6 diffs)

trunk/daemon/togad.py

@@ -160 +160 @@
                 id = self.getDatabase( "SELECT job_id FROM jobs WHERE job_id = '%s'" %jobid )
 
-                print id
-
                 if id:
 
@@ -185 +183 @@
 
                 debug_msg( 6, 'mutateJob(): %s %s' %(action,job_id))
-                print jobattrs
 
                 for valname, value in jobattrs.items():
-
-                        print valname, value
 
                         if valname in job_values and value:
@@ -217 +212 @@
 
                                 self.addNodes( value )
-                                #ids = self.getNodeIds( value )
-
-                                #for id in ids:
-                                #       self.addJobNode( job_id, id )
+                                node_list = value
 
                 if action == 'insert':
 
                         self.setDatabase( "INSERT INTO jobs ( %s ) VALUES ( %s )" %( insert_col_str, insert_val_str ) )
+                        ids = self.getNodeIds( node_list )
+
+                        self.addJobNodes( self. job_id, ids )
                 elif action == 'update':
 
@@ -238 +233 @@
                                 self.setDatabase( "INSERT INTO nodes ( node_hostname ) VALUES ( '%s' )" %node )
 
+        def addJobNodes( self, jobid, nodes ):
+
+                for node in nodes:
+                        self.addJobNode( jobid, node )
+
         def addJobNode( self, jobid, nodeid ):
 
@@ -379 +379 @@
                         self.myXMLSource = self.myXMLGatherer.getFileObject()
                         xml.sax.parse( self.myXMLSource, self.myXMLHandler, self.myXMLError )
-                        print self.myXMLHandler.jobAttrs
                         print 'sleep'
                         time.sleep( 1 )
@@ -432 +431 @@
                                                 if valname == 'nodes':
                                                         value = value.split( ';' )
-                                                        self.ds.addNodes( value )
 
                                                 jobinfo[ valname ] = value