Changeset 300

Timestamp:

04/12/07 15:01:26 (16 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

Location:

trunk/web/addons/job_monarch

Files:

• image.php (modified) (1 diff)
• index.php (modified) (1 diff)
• libtoga.php (modified) (2 diffs)
• overview.php (modified) (1 diff)

trunk/web/addons/job_monarch/image.php

@@ -59 +59 @@
 
         $ic = new ClusterImage( $clustername );
-        foreach( $filter as $filtername=>$filtervalue ) {
-                //printf("filter %s,%s\n", $filtername, $filtervalue);
-                switch( $filtername ) {
 
-                        case "id":
-                                $ic->setFilter( 'jobid', $filtervalue );
-                                break;
-                        case "user":
-                                $ic->setFilter( 'owner', $filtervalue);
-                                break;
-                        case "queue":
-                                $ic->setFilter( 'queue', $filtervalue);
-                                break;
-                        case "state":
-                                $ic->setFilter( 'status', $filtervalue);
-                                break;
-                        default:
-                                break;
+        if( isset( $filter ) ) {
+                foreach( $filter as $filtername=>$filtervalue ) {
+                        //printf("filter %s,%s\n", $filtername, $filtervalue);
+                        switch( $filtername ) {
+
+                                case "id":
+                                        $ic->setFilter( 'jobid', $filtervalue );
+                                        break;
+                                case "user":
+                                        $ic->setFilter( 'owner', $filtervalue);
+                                        break;
+                                case "queue":
+                                        $ic->setFilter( 'queue', $filtervalue);
+                                        break;
+                                case "state":
+                                        $ic->setFilter( 'status', $filtervalue);
+                                        break;
+                                default:
+                                        break;
+                        }
                 }
         }

trunk/web/addons/job_monarch/index.php

@@ -57 +57 @@
 
 // Fill filter array in order they were picked by user
-foreach( $myfilter_fields as $myfilter ) {
-
-        switch( $myfilter ) {
-
-                case "queue":
-                        $filter[queue]=$queue;
-                        break;
-                case "state":
-                        $filter[state]=$state;
-                        break;
-                case "user":
-                        $filter[user]=$user;
-                        break;
-                case "id":
-                        $filter[id]=$id;
-                        break;
+if( isset($myfilter_fields) ) {
+
+        foreach( $myfilter_fields as $myfilter ) {
+
+                switch( $myfilter ) {
+
+                        case "queue":
+                                $filter[queue]=$queue;
+                                break;
+                        case "state":
+                                $filter[state]=$state;
+                                break;
+                        case "user":
+                                $filter[user]=$user;
+                                break;
+                        case "id":
+                                $filter[id]=$id;
+                                break;
+                }
         }
 }

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;
                                         }
                                 }

trunk/web/addons/job_monarch/overview.php

@@ -540 +540 @@
                         $display_job = 1;
 
-                        foreach( $jobs[$jobid][nodes] as $tempnode )
-                                $all_used_nodes[] = $tempnode;
+                        if( $jobs[$jobid][status] == 'R' ) {
+                                foreach( $jobs[$jobid][nodes] as $tempnode ) {
+                                        $all_used_nodes[] = $tempnode;
+                                }
+                        }
 
                         $used_cpus += $cpus;