Mercurial > bms / file diff

--- a/www/import/from_brouwhulp.php	Wed Dec 19 21:58:21 2018 +0100
+++ b/www/import/from_brouwhulp.php	Sun Dec 23 20:13:36 2018 +0100
@@ -323,6 +323,7 @@
 		$sql .= "', kettle_volume='" . floatval($equipment->KETTLE_VOLUME);
 		$sql .= "', kettle_height='" . floatval($equipment->KETTLE_HEIGHT);
 		$sql .= "', mash_volume='" . floatval($equipment->MASH_VOLUME);
+		$sql .= "', mash_max='" . round((floatval($equipment->MASH_VOLUME) / 3) * 10) / 10;	// Not in beerxml/brouwhulp. For RIMS systems.
 		$sql .= "', efficiency='" . floatval($equipment->EFFICIENCY);
 		$sql .= "';";
 		if (! $result = mysqli_query($db, $sql)) {
@@ -854,8 +855,14 @@
 		if ($recipe->TARGET_PH) {
 			$sql .= "', mash_ph='" . floatval($recipe->TARGET_PH);
 		}
-		if ($recipe->SPARGE_ACID_TYPE) {
-			$sql .= "', sparge_acid_type='" . mysqli_real_escape_string($db, $recipe->SPARGE_ACID_TYPE);
+		if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Lactic")) {
+			$sql .= "', sparge_acid_type='Melkzuur";
+		} else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Hydrochloric")) {
+			$sql .= "', sparge_acid_type='Zoutzuur";
+		} else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Phosphoric")) {
+			$sql .= "', sparge_acid_type='Fosforzuur";
+		} else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Sulfuric")) {
+			$sql .= "', sparge_acid_type='Zwavelzuur";
 		}
 		if ($recipe->ACID_SPARGE_PERC) {
 			$sql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC);
@@ -1043,8 +1050,14 @@
 		if ($recipe->TARGET_PH) {
 			 $rsql .= "', mash_ph='" . floatval($recipe->TARGET_PH);
 		}
-		if ($recipe->SPARGE_ACID_TYPE) {
-			$rsql .= "', sparge_acid_type='" . mysqli_real_escape_string($db, $recipe->SPARGE_ACID_TYPE);
+		if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Lactic")) {
+			$rsql .= "', sparge_acid_type='Melkzuur";
+		} else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Hydrochloric")) {
+			$rsql .= "', sparge_acid_type='Zoutzuur";
+		} else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Phosphoric")) {
+			$rsql .= "', sparge_acid_type='Fosforzuur";
+		} else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Sulfuric")) {
+			$rsql .= "', sparge_acid_type='Zwavelzuur";
 		}
 		if ($recipe->ACID_SPARGE_PERC) {
 			$rsql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC);
@@ -1219,6 +1232,7 @@
 			$psql .= "', eq_kettle_volume='" . floatval($recipe->EQUIPMENT->KETTLE_VOLUME);
 			$psql .= "', eq_kettle_height='" . floatval($recipe->EQUIPMENT->KETTLE_HEIGHT);
 			$psql .= "', eq_mash_volume='" . floatval($recipe->EQUIPMENT->MASH_VOLUME);
+			$psql .= "', eq_mash_max='" . round((floatval($recipe->EQUIPMENT->MASH_VOLUME) / 3) * 10) / 10;     // Not in beerxml/brouwhulp. For RIMS systems.
 			$psql .= "', eq_efficiency='" . floatval($recipe->EQUIPMENT->EFFICIENCY);
 		}