Mercurial > bms / file diff

--- a/www/gethopsources.php	Mon Jul 05 20:59:10 2021 +0200
+++ b/www/gethopsources.php	Sun Jul 11 15:55:44 2021 +0200
@@ -1,7 +1,7 @@
 <?php
 require_once('config.php');
 
-$query = "SELECT * FROM inventory_hops ORDER BY origin,name";
+$query = "SELECT record,name,alpha,beta,humulene,caryophyllene,cohumulone,myrcene,hsi,total_oil,type,form,origin,inventory,cost FROM inventory_hops ORDER BY origin,name";
 $connect = mysqli_connect(DBASE_HOST,DBASE_USER,DBASE_PASS,DBASE_NAME);
 if (! $connect) {
 	echo "[]";
@@ -10,23 +10,7 @@
 mysqli_set_charset($connect, "utf8" );
 $result = mysqli_query($connect, $query);
 while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) {
-	$hops[] = array(
-		'record' => $row['record'],
-		'name' => $row['name'],
-		'alpha' => $row['alpha'],
-		'beta' => $row['beta'],
-		'humulene' => $row['humulene'],
-		'caryophyllene' => $row['caryophyllene'],
-		'cohumulone' => $row['cohumulone'],
-		'myrcene' => $row['myrcene'],
-		'hsi' => $row['hsi'],
-		'total_oil' => $row['total_oil'],
-		'type' => $row['type'],
-		'form' => $row['form'],
-		'origin' => $row['origin'],
-		'inventory' => $row['inventory'],
-		'cost' => $row['cost']
-	);
+	$hops[] = $row;
 }
 header("Content-type: application/json");
 echo json_encode($hops);