Fix for chart not rendering when new script version adds extra columns to data

Now the original number of columns from the first json file is used. If later files have more columns, they are ignored.

Author: elcojacobs

get_beer_data.php

@@ -49,6 +49,7 @@
 
 	// aggregate all json data for the beer
 	$renderedRow = false;
+	$cols = "";
 	echo "{\"rows\":[";
 	foreach ( $fileNames as $fileName ) {
 		$contents = file_get_contents(dirname(__FILE__) . '/' . $fileName);
@@ -59,10 +60,9 @@
 			echo get_list_between($contents, '"rows":' , ']}]');
 			$renderedRow = true;
 
-			$colsThisFile = get_list_between($contents, '"cols":' , ']');
-			if(strlen($colsThisFile) > strlen($cols)){
+			if($cols == ""){
 			    // use largest column list
-			    $cols = $colsThisFile;
+			    $cols = get_list_between($contents, '"cols":' , ']');
 			}
 		}
 	}

js/beer-chart.js

@@ -161,7 +161,7 @@ function toDygraphArray(jsonData) {
 
     for (i = 0; i < rows.length; i++){
         row = [];
-        for (j = 0; j < rows[i].c.length; j++) {
+        for (j = 0; j < Math.min(rows[i].c.length, handlers.length); j++) {
             handlers[j](j, rows[i].c[j]);
         }
         dataArray.push(row);