diff -r 2a6c00d325b2 -r e6e5d007eb54 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Mon Dec 17 13:46:15 2018 +0100 +++ b/www/import/from_brouwhulp.php Mon Dec 17 22:24:32 2018 +0100 @@ -853,6 +853,24 @@ if ($recipe->STYLE) { $sql .= recipe_style($recipe); } + if ($recipe->CALC_ACID) { + ($recipe->CALC_ACID == "TRUE") ? $sql .= "', calc_acid='1" : $sql .= "', calc_acid='0"; + } + 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->ACID_SPARGE_PERC) { + $sql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC); + } + if ($recipe->LACTIC_SPARGE) { + $sql .= "', sparge_acid_amount='" . floatval($recipe->LACTIC_SPARGE); + } + if ($recipe->VOLUME_HLT) { + $sql .= "', sparge_volume='" . floatval($recipe->VOLUME_HLT); + } /* * Put the fermentables in a json array @@ -908,8 +926,8 @@ * Put the mash in a json array */ if ($recipe->MASH) { - $sql .= "',mash_sparge_temp='" . floatval($recipe->MASH->SPARGE_TEMP); - $sql .= "',mash_ph='" . floatval($recipe->MASH->PH); + $sql .= "',sparge_temp='" . floatval($recipe->MASH->SPARGE_TEMP); + $sql .= "',sparge_ph='" . floatval($recipe->MASH->PH); if ($recipe->MASH->NAME) $sql .= "',mash_name='" . mysqli_real_escape_string($db, $recipe->MASH->NAME); @@ -1029,6 +1047,25 @@ $rsql .= recipe_style($recipe); } + if ($recipe->CALC_ACID) { + ($recipe->CALC_ACID == "TRUE") ? $rsql .= "', calc_acid='1" : $rsql .= "', calc_acid='0"; + } + 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->ACID_SPARGE_PERC) { + $rsql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC); + } + if ($recipe->LACTIC_SPARGE) { + $rsql .= "', sparge_acid_amount='" . floatval($recipe->LACTIC_SPARGE); + } + if ($recipe->VOLUME_HLT) { + $rsql .= "', sparge_volume='" . floatval($recipe->VOLUME_HLT); + } + /* * Put the fermentables in a json array */ @@ -1083,8 +1120,8 @@ * Put the mash in a json array */ if ($recipe->MASH) { - $rsql .= "',mash_sparge_temp='" . floatval($recipe->MASH->SPARGE_TEMP); - $rsql .= "',mash_ph='" . floatval($recipe->MASH->PH); + $rsql .= "',sparge_temp='" . floatval($recipe->MASH->SPARGE_TEMP); + $rsql .= "',sparge_ph='" . floatval($recipe->MASH->PH); if ($recipe->MASH->NAME) $rsql .= "',mash_name='" . mysqli_real_escape_string($db, $recipe->MASH->NAME);