Changeset 300 for trunk/web/addons/job_monarch/libtoga.php

Timestamp:

04/12/07 15:01:26 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/overview.php,
web/addons/job_monarch/index.php,
web/addons/job_monarch/libtoga.php,
web/addons/job_monarch/image.php:

• fixes for latest php4, is more strict with foreach loop

File:

• trunk/web/addons/job_monarch/libtoga.php (modified) (2 diffs)

trunk/web/addons/job_monarch/libtoga.php

@@ -615 +615 @@
                                                         $mynodes = explode( ';', $togavalue );
 
+                                                        //print_r($mynodes);
+
                                                         foreach( $mynodes as $node ) {
 
@@ -636 +638 @@
                         
                                         $nr_nodes = count( $jobs[$jobid][nodes] );
-                        
-                                        foreach( $jobs[$jobid][nodes] as $node ) {
-
-                                                $domain = $jobs[$jobid][domain];
-                                                $domain_len = 0 - strlen( $domain );
-
-                                                if( substr( $node, $domain_len ) != $domain ) {
-                                                        $host = $node. '.'.$domain;
-                                                } else {
-                                                        $host = $node;
+                
+                                        if( $jobs[$jobid][status] == 'R' ) {
+
+                                                foreach( $jobs[$jobid][nodes] as $node ) {
+
+                                                        $domain = $jobs[$jobid][domain];
+                                                        $domain_len = 0 - strlen( $domain );
+
+                                                        if( substr( $node, $domain_len ) != $domain ) {
+                                                                $host = $node. '.'.$domain;
+                                                        } else {
+                                                                $host = $node;
+                                                        }
+
+                                                        //$host = $node.'.'.$jobs[$jobid][domain];
+                                
+                                                        if( !isset( $nodes[$host] ) )
+                                                                $my_node = new NodeImage( $host );
+                                                        else
+                                                                $my_node = $nodes[$host];
+
+                                                        if( !$my_node->hasJob( $jobid ) )
+
+                                                                if( isset( $jobs[$jobid][ppn] ) )
+                                                                        $my_node->addJob( $jobid, ((int) $jobs[$jobid][ppn]) );
+                                                                else
+                                                                        $my_node->addJob( $jobid, 1 );
+
+                                                        $nodes[$host] = $my_node;
                                                 }
-
-                                                //$host = $node.'.'.$jobs[$jobid][domain];
-                                
-                                                if( !isset( $nodes[$host] ) )
-                                                        $my_node = new NodeImage( $host );
-                                                else
-                                                        $my_node = $nodes[$host];
-
-                                                if( !$my_node->hasJob( $jobid ) )
-
-                                                        if( isset( $jobs[$jobid][ppn] ) )
-                                                                $my_node->addJob( $jobid, ((int) $jobs[$jobid][ppn]) );
-                                                        else
-                                                                $my_node->addJob( $jobid, 1 );
-
-                                                $nodes[$host] = $my_node;
                                         }
                                 }