Changeset 411

Timestamp:

07/06/07 15:50:48 (16 years ago)

Author:

bastiaans

Message:

web/addons/job_monarch/host_view.php:

• make header properly according to new setup

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

• use correct metricname parsing

Location:

trunk/web/addons/job_monarch

Files:

• host_view.php (modified) (1 diff)
• index.php (modified) (2 diffs)
• search.php (modified) (2 diffs)

trunk/web/addons/job_monarch/host_view.php

@@ -76 +76 @@
         $metrics = $metrics[$hostname];
         $mymetrics = array();
+
+        $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
+        $title = "Batch Archive Node Report";
+
+        makeHeader( 'host_view', $title, $longtitle );
 
         foreach( $rrdirs as $rrdir ) 

trunk/web/addons/job_monarch/index.php

@@ -107 +107 @@
         global $default_refresh, $filterorder, $view;
         global $JOB_ARCHIVE, $period_start, $period_stop, $h, $id;
-        global $job_start, $job_stop, $range, $r;
+        global $job_start, $job_stop, $range, $r, $metricname;
         
         if( isset($default_metric) and !isset($m) )
@@ -286 +286 @@
         }
 
-        $m = $metricname;
+        //$m = $metricname;
 
 

trunk/web/addons/job_monarch/search.php

@@ -23 +23 @@
  */
 
-global $clustername, $tpl;
+global $clustername, $tpl, $m, $metric;
 
 function validateFormInput() {
@@ -255 +255 @@
         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, $COLUMN_NODES;
-
-        $metricname = $m;
+        global $SEARCH_RESULT_LIMIT, $COLUMN_NODES, $metricname;
+
+        //$metricname = $m;
         //printf("job_start = %s job_stop = %s\n", $job_start, $job_stop );
         //printf("start = %s stop = %s\n", $start, $stop );
+        //printf("m %s\n", $metricname );
 
         $longtitle = "Batch Archive Search :: Powered by Job Monarch!";