Changeset 299 for trunk/web/addons/job_monarch/search.php

Timestamp:

04/06/07 13:21:35 (17 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/conf.php:

• added COLUMN_NODES option to display job node hostnames column

web/addons/job_monarch/search.php,
web/addons/job_monarch/overview.php:

• added handling of COLUMN_NODES

web/addons/job_monarch/templates/search.tpl,
web/addons/job_monarch/templates/overview.tpl:

• added COLUMN_NODES to html

File:

• trunk/web/addons/job_monarch/search.php (modified) (3 diffs)

trunk/web/addons/job_monarch/search.php

@@ -325 +325 @@
         global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up, $hc;
         global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY;
-        global $SEARCH_RESULT_LIMIT;
+        global $SEARCH_RESULT_LIMIT, $COLUMN_NODES;
 
         $metricname = $m;
@@ -377 +377 @@
                         $tpl->newBlock( "column_header_req_mem" );
                 }
+                if( $COLUMN_NODES ) {
+                        $tpl->newBlock( "column_header_nodes" );
+                }
 
                 //print_r( $nodes );
@@ -402 +405 @@
                         if( $COLUMN_REQUESTED_MEMORY ) {
                                 $tpl->newBlock( "column_req_mem" );
-                                $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                //$tpl->assign( "req_memory", $jobs[$jobid][requested_memory] );
+                                $tpl->assign( "req_memory", $job[requested_memory] );
+                                $tpl->gotoBlock( "node" );
+                        }
+                        if( $COLUMN_NODES) {
+
+                                foreach( $nodes[$foundid] as $mynode )
+                                        $job_nodes[] = $mynode[hostname];
+
+                                $tpl->newBlock( "column_nodes" );
+                                $nodes_hostnames = implode( " ", $job_nodes );
+                                $tpl->assign( "nodes_hostnames", $nodes_hostnames );
                                 $tpl->gotoBlock( "node" );
                         }