# HG changeset patch # User Michiel Broek # Date 1535721500 -7200 # Node ID 4d27a7fb1265e2b5e4bdfe6c0e95b3f5b33808b0 # Parent bdd1ec9b9c06ff68143079d24ed13617b694e3a1 Finisched recipe import. Added recipe retrieve script. diff -r bdd1ec9b9c06 -r 4d27a7fb1265 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Thu Aug 30 22:22:09 2018 +0200 +++ b/www/import/from_brouwhulp.php Fri Aug 31 15:18:20 2018 +0200 @@ -436,6 +436,7 @@ $len_fermentables = 0; $len_hops = 0; $len_miscs = 0; + $len_yeasts = 0; $len_waters = 0; $len_mash = 0; @@ -599,12 +600,130 @@ } $miscs .= ']'; - echo $miscs . PHP_EOL; +// echo $miscs . PHP_EOL; $sql .= "', json_miscs='" . $miscs; if (strlen($miscs) > $len_miscs) $len_miscs = strlen($miscs); } + /* + * Put the yeasts in a json array + */ + if ($recipe->YEASTS) { + $yeasts = "["; + $comma = FALSE; + foreach ($recipe->YEASTS->YEAST as $yeast) { + if ($comma) + $yeasts .= ','; + $comma = TRUE; + $yeasts .= '{"name":"' . mysqli_real_escape_string($db, $yeast->NAME) . '"'; + $yeasts .= ',"amount":' . floatval($yeast->AMOUNT); + if ($yeast->COST) + $yeasts .= ',"cost":' . floatval($yeast->COST); + $yeasts .= ',"laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"'; + $yeasts .= ',"product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"'; + $yeasts .= ',"type":"' . mysqli_real_escape_string($db, $yeast->TYPE) . '"'; + $yeasts .= ',"form":"' . mysqli_real_escape_string($db, $yeast->FORM) . '"'; + ($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"amount_is_weight":true' : $yeasts.= ',"amount_is_weight":false'; + if ($yeast->ADD_TO_SECONDARY=="FALSE") { + $yeasts .= ',"use":"Primary"'; + } else if ($yeast->PRODUCT_ID=="F2") { + $yeasts .= ',"use":"Bottle"'; + } else { + $yeasts .= ',"use":"Secondary"'; + } + $yeasts .= "}"; + } + + $yeasts .= ']'; +// echo $yeasts . PHP_EOL; + $sql .= "', json_yeasts='" . $yeasts; + if (strlen($yeasts) > $len_yeasts) + $len_yeasts = strlen($yeasts); + } + + /* + * Put the waters in a json array + */ + if ($recipe->WATERS) { + $waters = "["; + $comma = FALSE; + foreach ($recipe->WATERS->WATER as $water) { + if ($comma) + $waters .= ','; + $comma = TRUE; + $waters .= '{"name":"' . mysqli_real_escape_string($db, $water->NAME) . '"'; + $waters .= ',"amount":' . floatval($water->AMOUNT); + if ($water->CALCIUM) + $waters .= ',"calcium":' . floatval($water->CALCIUM); + if ($water->BICARBONATE) + $waters .= ',"bicarbonate":' . floatval($water->BICARBONATE); + if ($water->SULFATE) + $waters .= ',"sulfate":' . floatval($water->SULFATE); + if ($water->CHLORIDE) + $waters .= ',"chloride":' . floatval($water->CHLORIDE); + if ($water->SODIUM) + $waters .= ',"sodium":' . floatval($water->SODIUM); + if ($water->MAGNESIUM) + $waters .= ',"magnesium":' . floatval($water->MAGNESIUM); + if ($water->PH) + $waters .= ',"ph":' . floatval($water->PH); + if ($water->TOTAL_ALKALINITY) + $waters .= ',"total_alkalinity":' . floatval($water->TOTAL_ALKALINITY); + $waters .= "}"; + } + + $waters .= ']'; +// echo $waters . PHP_EOL; + $sql .= "', json_waters='" . $waters; + if (strlen($waters) > $len_waters) + $len_waters = strlen($waters); + } + + /* + * Put the mash in a json array + */ + if ($recipe->MASH) { + $mash = '{"sparge_temp":' . floatval($recipe->MASH->SPARGE_TEMP); + $mash .= ',"ph":' . floatval($recipe->MASH->PH); + if ($recipe->MASH->NAME) + $mash .= ',"name":"' . mysqli_real_escape_string($db, $recipe->MASH->NAME) . '"'; + if ($recipe->MASH->MASH_STEPS) { + $steps = ',"mash_steps":['; + $comma = FALSE; + foreach ($recipe->MASH->MASH_STEPS->MASH_STEP as $step) { + if ($comma) + $steps .= ','; + $comma = TRUE; + $steps .= '{"step_name":"' . mysqli_real_escape_string($db, $step->NAME) . '"'; + if ($step->TYPE) { + $steps .= ',"step_type":"' . $step->TYPE . '"'; + } + if ($step->STEP_TEMP) { + $steps .= ',"step_temp":"' . $step->STEP_TEMP . '"'; + } + if ($step->STEP_TIME) { + $steps .= ',"step_time":"' . $step->STEP_TIME . '"'; + } + if ($step->RAMP_TIME) { + $steps .= ',"ramp_time":"' . $step->RAMP_TIME . '"'; + } + if ($step->END_TEMP) { + $steps .= ',"end_temp":"' . $step->END_TEMP . '"'; + } + $steps .= "}"; + } + $steps .= ']'; + $mash .= $steps; + } + + $mash .= '}'; + echo $mash . PHP_EOL; + $sql .= "', json_mash='" . $mash; + if (strlen($mash) > $len_mash) + $len_mash = strlen($mash); + } + $sql .= "';"; if (! $result = mysqli_query($db, $sql)) { printf("Error: %s\n", mysqli_error($db)); @@ -613,6 +732,7 @@ echo "Fermentables: " . $len_fermentables . PHP_EOL; echo "Hops: " . $len_hops . PHP_EOL; echo "Miscs: " . $len_miscs . PHP_EOL; + echo "Yeasts: " . $len_yeasts . PHP_EOL; echo "Waters: " . $len_waters . PHP_EOL; echo "Mash: " . $len_mash . PHP_EOL; } diff -r bdd1ec9b9c06 -r 4d27a7fb1265 www/includes/db_recipes.php --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/www/includes/db_recipes.php Fri Aug 31 15:18:20 2018 +0200 @@ -0,0 +1,95 @@ +