Merge pull request #20 from maierbenedikt/production

Graph function for individual replica transfer

Author: yiiyama

web/html/dynamo/dynamo/dealermon/sites.php

@@ -171,16 +171,19 @@ function single_rrd_to_array($rrd,$rrdpath){
 	$replicaname1 = str_replace('.rrd', '', $replicaname);
 	$replicaname_explode = explode("_", $replicaname1, 2);
 	$replicaname2 = $replicaname_explode[1];
+	$replicatograph = str_replace('/', "+",$_REQUEST['replicaname']);
+	$replicatograph = ltrim($replicatograph, '+');
 
-	if ($replicaname2 !=  str_replace(' ', "+",$_REQUEST['replicaname']))
+
+	if ($replicaname2 !=  $replicatograph)
 
 	  continue;
-	$replicadata = single_rrd_to_array($replicaname, $sitename);
+	$replicadata = single_rrd_to_array($replicaname, $sitename);	
 
 	$ratio = array();
 
 	for($j = 0; $j < count($replicadata[2]); $j++){
-	  $ratio[] = $replicadata[1][$j]/$replicadata[2][$j];
+	  $ratio[] = $replicadata[1][$j]/$replicadata[2][$j] * 100;
 	}
 	$replicainfo = array('replica' => $replicaname1, 'time' => $replicadata[0], 'copied' => $replicadata[1], 'total' => $replicadata[2], 'ratio' => $ratio);
 	$siteinfo['data'][] = $replicainfo;
@@ -193,7 +196,7 @@ function single_rrd_to_array($rrd,$rrdpath){
 }
 
 
-if ( !(isset($_REQUEST['getSiteCSVs'])) ){
+if ( !(isset($_REQUEST['norm'])) ){
 
 
   $html = file_get_contents(__DIR__ . '/csvs.html');