Mercurial > mbsePi-apps / file diff

--- a/www-thermferm/getalog.php	Sun May 28 14:19:57 2017 +0200
+++ b/www-thermferm/getalog.php	Wed May 31 16:29:52 2017 +0200
@@ -1,6 +1,6 @@
 <?php
 /*****************************************************************************
- * Copyright (C) 2015
+ * Copyright (C) 2015-2017
  *   
  * Michiel Broek <mbroek at mbse dot eu>
  *
@@ -39,10 +39,20 @@
 	if ($j > 1)
 	    $row .= ',';
 	$f = explode(",", $arr[$j]);
-	$heater   = $f[5] / 100;
-	$cooler   = $f[6] / 100;
-	$row .= '{"Date":"'.$f[0].'","Mode":"'.$f[1].'","Air":"'.$f[2].'","Beer":"'.$f[3].'","Target_lo":"'.$f[4].'",';
-        $row .= '"Heater":'.$heater.',"Cooler":'.$cooler.',"HeatUse":'.$f[7].',"CoolUse":"'.$f[8].'","Room":"'.$f[9].'","Target_hi":"'.$f[10].'"}';
+	$reply = array (
+	    'Date'      => $f[0],
+	    'Mode'      => $f[1],
+	    'Air'       => $f[2],
+	    'Beer'      => $f[3],
+	    'Target_lo' => $f[4],
+	    'Heater'    => $f[5] / 100,
+	    'Cooler'    => $f[6] / 100,
+	    'HeatUse'   => $f[7],
+	    'CoolUse'   => $f[8],
+	    'Room'      => $f[9],
+	    'Target_hi' => $f[10]
+        );
+	$row .= json_encode($reply, JSON_NUMERIC_CHECK);
 	$j++;
     }
 }