Changeset 603 for trunk

Timestamp:

02/17/09 00:19:52 (15 years ago)

Author:

ramonb

Message:

jobstore.php:

• sort metrics list
• include reports in metric list

File:

• trunk/web2/addons/job_monarch/jobstore.php (modified) (1 diff)

trunk/web2/addons/job_monarch/jobstore.php

@@ -111 +111 @@
 function getMetrics( $host=null )
 {
-        global $metrics;
+        global $metrics, $reports;
 
         reset($metrics);
+
+        $context_metrics        = array();
+
         if( !$host)
         {
-          $firsthost = key($metrics);
+                $firsthost = key($metrics);
         }
         else
         {
-          $firsthost = $host;
+                $firsthost = $host;
         }
 
         $first_metrics = $metrics[$firsthost];
 
+        foreach( $first_metrics as $metricname => $metricval )
+        {
+                $context_metrics[] = $metricname;
+        }
+
+        foreach ($reports as $mr => $mfoo)
+        {
+                $context_metrics[] = $mr;
+        }
+
+        sort( $context_metrics );
+
         $metric_list    = array();
-
         $metric_count   = 0;
 
-        foreach( $first_metrics as $metricname => $metricval )
+        foreach( $context_metrics as $metricname )
         {
                 $metric         = array();