Index: branches/0.4/web/addons/job_monarch/host_view.php
===================================================================
--- branches/0.4/web/addons/job_monarch/host_view.php	(revision 690)
+++ branches/0.4/web/addons/job_monarch/host_view.php	(revision 719)
@@ -62,166 +62,166 @@
 function makeHostView() {
 
-	global $tpl, $metrics, $clustername, $hostname;
-	global $cluster_ul, $hosts_up, $get_metric_string;
-	global $cluster, $period_start, $period_stop;
-	global $job_start, $job_stop;
-
-	//print_r( $metrics );
-
-	//printf( "c %s\n", $clustername );
-
-	$trd = new TarchRrdGraph( $clustername, $hostname );
-	$rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
-
-	$longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
-	$title = "Batch Archive Node Report";
-
-	makeHeader( 'host_view', $title, $longtitle );
-
-	$metrics = $metrics[$hostname];
-	$mymetrics = array();
-
-	foreach( $rrdirs as $rrdir ) 
-	{
-		$ml	= $trd->dirList( $rrdir );
-
-		foreach( $ml as $lmetr )
-		{
-			$metrn_fields	= explode( '.', $lmetr );
-
-			$metrn		= $metrn_fields[0];
-
-			if( !in_array( $metrn, $mymetrics ) )
-			{
-				$mymetrics[$metrn]	= $metrics[$metrn];
-			}
-		}
-	}
-
-	$hosts_up = $hosts_up[$hostname];
-	//print_r( $hosts_up );
-
-	$tpl->assign("cluster", $clustername);
-	$tpl->assign("host", $hostname);
-	$tpl->assign("node_image", "../../".node_image($metrics));
-	$tpl->assign("sort",$sort);
-	$tpl->assign("range",$range);
-
-	if( !is_numeric( $period_start ) ) {
-		$period_start = datetimeToEpoch( $period_start );
-	}
-	if( !is_numeric( $period_stop ) ) {
-		$period_stop = datetimeToEpoch( $period_stop );
-	}
-
-	if($hosts_up)
-	      $tpl->assign("node_msg", "This host is up and running."); 
-	else
-	      $tpl->assign("node_msg", "This host is down."); 
-
-	$cluster_url=rawurlencode($clustername);
-	$tpl->assign("cluster_url", $cluster_url);
-	//$tpl->assign("graphargs", "h=$hostname&$get_metric_string&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
-	$tpl->assign("graphargs", "h=$hostname&$get_metric_string&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
-
-	# For the node view link.
-	$tpl->assign("node_view","./?p=2&c=$cluster_url&h=$hostname");
-
-	//# No reason to go on if this node is down.
-	//if ($hosts_down)
-	//   {
-	//      $tpl->printToScreen();
-	//      return;
-	//   }
-
-	$tpl->assign("ip", $hosts_up[IP]);
-
-	foreach ($mymetrics as $name => $v)
-	   {
-	       if ($v[TYPE] == "string" or $v[TYPE]=="timestamp" or $always_timestamp[$name])
-		  {
-		     # Long gmetric name/values will disrupt the display here.
-		     if ($v[SOURCE] == "gmond") $s_metrics[$name] = $v;
-		  }
-	       elseif ($v[SLOPE] == "zero" or $always_constant[$name])
-		  {
-		     $c_metrics[$name] = $v;
-		  }
-	       else if ($reports[$metric])
-		  continue;
-	       else
-		  {
-		     //$graphargs = "c=$cluster_url&h=$hostname&v=$v[VAL]&m=$name"
-		     //  ."&z=medium&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
-		     $graphargs = "c=$cluster_url&h=$hostname&m=$name"
-		       ."&z=medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
-		     # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>.
-		     if ($v[UNITS]) {
-			$encodeUnits = rawurlencode($v[UNITS]);
-			$graphargs .= "&vl=$encodeUnits";
-		     }
-		     $g_metrics[$name][graph] = $graphargs;
+    global $tpl, $metrics, $clustername, $hostname;
+    global $cluster_ul, $hosts_up, $get_metric_string;
+    global $cluster, $period_start, $period_stop;
+    global $job_start, $job_stop;
+
+    //print_r( $metrics );
+
+    //printf( "c %s\n", $clustername );
+
+    $trd = new TarchRrdGraph( $clustername, $hostname );
+    $rrdirs = $trd->getRrdDirs( $period_start, $period_stop );
+
+    $longtitle = "Batch Archive Node Report :: Powered by Job Monarch!";
+    $title = "Batch Archive Node Report";
+
+    makeHeader( 'host_view', $title, $longtitle );
+
+    $metrics = $metrics[$hostname];
+    $mymetrics = array();
+
+    foreach( $rrdirs as $rrdir ) 
+    {
+        $ml    = $trd->dirList( $rrdir );
+
+        foreach( $ml as $lmetr )
+        {
+            $metrn_fields    = explode( '.', $lmetr );
+
+            $metrn        = $metrn_fields[0];
+
+            if( !in_array( $metrn, $mymetrics ) )
+            {
+                $mymetrics[$metrn]    = $metrics[$metrn];
+            }
+        }
+    }
+
+    $hosts_up = $hosts_up[$hostname];
+    //print_r( $hosts_up );
+
+    $tpl->assign("cluster", $clustername);
+    $tpl->assign("host", $hostname);
+    $tpl->assign("node_image", "../../".node_image($metrics));
+    $tpl->assign("sort",$sort);
+    $tpl->assign("range",$range);
+
+    if( !is_numeric( $period_start ) ) {
+        $period_start = datetimeToEpoch( $period_start );
+    }
+    if( !is_numeric( $period_stop ) ) {
+        $period_stop = datetimeToEpoch( $period_stop );
+    }
+
+    if($hosts_up)
+          $tpl->assign("node_msg", "This host is up and running."); 
+    else
+          $tpl->assign("node_msg", "This host is down."); 
+
+    $cluster_url=rawurlencode($clustername);
+    $tpl->assign("cluster_url", $cluster_url);
+    //$tpl->assign("graphargs", "h=$hostname&$get_metric_string&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
+    $tpl->assign("graphargs", "h=$hostname&$get_metric_string&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop");
+
+    # For the node view link.
+    $tpl->assign("node_view","./?p=2&c=$cluster_url&h=$hostname");
+
+    //# No reason to go on if this node is down.
+    //if ($hosts_down)
+    //   {
+    //      $tpl->printToScreen();
+    //      return;
+    //   }
+
+    $tpl->assign("ip", $hosts_up[IP]);
+
+    foreach ($mymetrics as $name => $v)
+       {
+           if ($v[TYPE] == "string" or $v[TYPE]=="timestamp" or $always_timestamp[$name])
+          {
+             # Long gmetric name/values will disrupt the display here.
+             if ($v[SOURCE] == "gmond") $s_metrics[$name] = $v;
           }
-	   }
-	# Add the uptime metric for this host. Cannot be done in ganglia.php,
-	# since it requires a fully-parsed XML tree. The classic contructor problem.
-	$s_metrics[uptime][TYPE] = "string";
-	$s_metrics[uptime][VAL] = uptime($cluster[LOCALTIME] - $metrics[boottime][VAL]);
-
-	# Add the gmond started timestamps & last reported time (in uptime format) from
-	# the HOST tag:
-	$s_metrics[gmond_started][TYPE] = "timestamp";
-	$s_metrics[gmond_started][VAL] = $hosts_up[GMOND_STARTED];
-	$s_metrics[last_reported][TYPE] = "string";
-	$s_metrics[last_reported][VAL] = uptime($cluster[LOCALTIME] - $hosts_up[REPORTED]);
-
-	# Show string metrics
-	if (is_array($s_metrics))
-	   {
-	      ksort($s_metrics);
-	      foreach ($s_metrics as $name => $v )
-	     {
-		$tpl->newBlock("string_metric_info");
-		$tpl->assign("name", $name);
-		if( $v[TYPE]=="timestamp" or $always_timestamp[$name])
-		   {
-		      $tpl->assign("value", date("r", $v[VAL]));
-		   }
-		else
-		   {
-		      $tpl->assign("value", "$v[VAL] $v[UNITS]");
-		   }
-	     }
-	   }
-
-	# Show constant metrics.
-	if (is_array($c_metrics))
-	   {
-	      ksort($c_metrics);
-	      foreach ($c_metrics as $name => $v )
-	     {
-		$tpl->newBlock("const_metric_info");
-		$tpl->assign("name", $name);
-		$tpl->assign("value", "$v[VAL] $v[UNITS]");
-	     }
-	   }
-
-	# Show graphs.
-	if (is_array($g_metrics))
-	   {
-	      ksort($g_metrics);
-
-	      $i = 0;
-	      foreach ( $g_metrics as $name => $v )
-		 {
-		    $tpl->newBlock("vol_metric_info");
-		    $tpl->assign("graphargs", $v[graph]);
-		    $tpl->assign("alt", "$hostname $name");
-		    if($i++ %2)
-		       $tpl->assign("br", "<BR>");
-		 }
-	   }
+           elseif ($v[SLOPE] == "zero" or $always_constant[$name])
+          {
+             $c_metrics[$name] = $v;
+          }
+           else if ($reports[$metric])
+          continue;
+           else
+          {
+             //$graphargs = "c=$cluster_url&h=$hostname&v=$v[VAL]&m=$name"
+             //  ."&z=medium&st=$cluster[LOCALTIME]&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+             $graphargs = "c=$cluster_url&h=$hostname&m=$name"
+               ."&z=medium&job_start=$job_start&job_stop=$job_stop&period_start=$period_start&period_stop=$period_stop";
+             # Adding units to graph 2003 by Jason Smith <smithj4@bnl.gov>.
+             if ($v[UNITS]) {
+            $encodeUnits = rawurlencode($v[UNITS]);
+            $graphargs .= "&vl=$encodeUnits";
+             }
+             $g_metrics[$name][graph] = $graphargs;
+          }
+       }
+    # Add the uptime metric for this host. Cannot be done in ganglia.php,
+    # since it requires a fully-parsed XML tree. The classic contructor problem.
+    $s_metrics[uptime][TYPE] = "string";
+    $s_metrics[uptime][VAL] = uptime($cluster[LOCALTIME] - $metrics[boottime][VAL]);
+
+    # Add the gmond started timestamps & last reported time (in uptime format) from
+    # the HOST tag:
+    $s_metrics[gmond_started][TYPE] = "timestamp";
+    $s_metrics[gmond_started][VAL] = $hosts_up[GMOND_STARTED];
+    $s_metrics[last_reported][TYPE] = "string";
+    $s_metrics[last_reported][VAL] = uptime($cluster[LOCALTIME] - $hosts_up[REPORTED]);
+
+    # Show string metrics
+    if (is_array($s_metrics))
+       {
+          ksort($s_metrics);
+          foreach ($s_metrics as $name => $v )
+         {
+        $tpl->newBlock("string_metric_info");
+        $tpl->assign("name", $name);
+        if( $v[TYPE]=="timestamp" or $always_timestamp[$name])
+           {
+              $tpl->assign("value", date("r", $v[VAL]));
+           }
+        else
+           {
+              $tpl->assign("value", "$v[VAL] $v[UNITS]");
+           }
+         }
+       }
+
+    # Show constant metrics.
+    if (is_array($c_metrics))
+       {
+          ksort($c_metrics);
+          foreach ($c_metrics as $name => $v )
+         {
+        $tpl->newBlock("const_metric_info");
+        $tpl->assign("name", $name);
+        $tpl->assign("value", "$v[VAL] $v[UNITS]");
+         }
+       }
+
+    # Show graphs.
+    if (is_array($g_metrics))
+       {
+          ksort($g_metrics);
+
+          $i = 0;
+          foreach ( $g_metrics as $name => $v )
+         {
+            $tpl->newBlock("vol_metric_info");
+            $tpl->assign("graphargs", $v[graph]);
+            $tpl->assign("alt", "$hostname $name");
+            if($i++ %2)
+               $tpl->assign("br", "<BR>");
+         }
+       }
 }
 
-	//$tpl->printToScreen();
+    //$tpl->printToScreen();
 ?>
