Mercurial > bms / file diff

--- a/www/import/from_brouwhulp.php	Wed Jan 30 18:58:47 2019 +0100
+++ b/www/import/from_brouwhulp.php	Wed Jan 30 23:08:05 2019 +0100
@@ -155,12 +155,12 @@
 			$sql .= "', beta='" . floatval($hop->BETA);
 		if ($hop->HUMULENE)
 			$sql .= "', humulene='" . floatval($hop->HUMULENE);
-		if ($hop->CARYOPHYLLENE)
-			$sql .= "', caryophyllene='" . floatval($hop->CARYOPHYLLENE);
+		if ($hop->CAROPHYLLENE)
+			$sql .= "', caryophyllene='" . floatval($hop->CAROPHYLLENE);
 		if ($hop->COHUMULONE)
 			$sql .= "', cohumulone='" . floatval($hop->COHUMULONE);
-		if ($hop->MYCRENE)
-			$sql .= "', myrcene='" . floatval($hop->MYCRENE);
+		if ($hop->MYRCENE)
+			$sql .= "', myrcene='" . floatval($hop->MYRCENE);
 		if ($hop->HSI)
 			$sql .= "', hsi='" . floatval($hop->HSI);
 
@@ -875,7 +875,7 @@
 		$hops .= ',"h_beta":' . floatval($hop->BETA);
 		$hops .= ',"h_hsi":' . floatval($hop->HSI);
 		$hops .= ',"h_humulene":' . floatval($hop->HUMULENE);
-		$hops .= ',"h_carophyllene":' . floatval($hop->CAROPHYLLENE);
+		$hops .= ',"h_caryophyllene":' . floatval($hop->CAROPHYLLENE);
 		$hops .= ',"h_cohumulone":' . floatval($hop->COHUMULONE);
 		$hops .= ',"h_myrcene":' . floatval($hop->MYRCENE);
 		if ($hop->TOTAL_OIL)