Changeset 191 for trunk/daemon/togad.py

Timestamp:

08/09/05 10:44:07 (18 years ago)

Author:

bastiaans

Message:

daemon/togad.py:

• Fixed the bugfix

File:

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

trunk/daemon/togad.py

@@ -154 +154 @@
                 return result
 
+        def getJobNodeId( self, job_id, node_id ):
+
+                id = self.getDatabase( "SELECT job_id,node_id FROM job_nodes WHERE job_id = '%s' AND node_id = '%s'" %(job_id, node_id) )
+                if len( id ) > 0:
+
+                        if len( id[0] ) > 0 and id[0] != '':
+                        
+                                return 1
+
+                return 0
+
         def getNodeId( self, hostname ):
 
@@ -237 +248 @@
                         elif valname == 'nodes' and value:
 
-                                node_invalid = 0
+                                node_valid = 1
 
                                 if len(value) == 1:
                                 
-                                        for node_char in str(value[0]):
-
-                                                if string.find( string.digits, node_char ) == -1:
-
-                                                        node_invalid = 1
-
-                                if not node_invalid:
+                                        if jobattrs['status'] == 'Q':
+
+                                                node_valid = 0
+
+                                        else:
+
+                                                node_valid = 0
+
+                                                for node_char in str(value[0]):
+
+                                                        if string.find( string.digits, node_char ) != -1 and not node_valid:
+
+                                                                node_valid = 1
+
+                                if node_valid:
 
                                         ids = self.addNodes( value, jobattrs['domain'] )
 
-                                else:
-                                        ids = [ ]
-
-                                node_list = value
-
                 if action == 'insert':
 
                         self.setDatabase( "INSERT INTO jobs ( %s ) VALUES ( %s )" %( insert_col_str, insert_val_str ) )
 
-                        if len( ids ) > 0:
-                                self.addJobNodes( job_id, ids )
-
                 elif action == 'update':
 
                         self.setDatabase( "UPDATE jobs SET %s WHERE job_id=%s" %(update_str, job_id) )
 
-                        if len( ids ) > 0:
-                                self.addJobNodes( job_id, ids )
+                if len( ids ) > 0:
+                        self.addJobNodes( job_id, ids )
 
         def addNodes( self, hostnames, domain ):
@@ -290 +301 @@
 
                 for node in nodes:
-                        self.addJobNode( jobid, node )
+
+                        if not self.getJobNodeId( jobid, node ):
+
+                                self.addJobNode( jobid, node )
 
         def addJobNode( self, jobid, nodeid ):