diff -r 4c21eabb3c0e -r 14e349ff2a10 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Sun Jan 27 23:35:19 2019 +0100 +++ b/www/import/from_brouwhulp.php Tue Jan 29 21:52:08 2019 +0100 @@ -98,8 +98,6 @@ if ($fermentable->MAX_IN_BATCH) $sql .= "', max_in_batch='" . floatval($fermentable->MAX_IN_BATCH); ($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='1" : $sql .= "', recommend_mash='0"; - if ($fermentable->IBU_GAL_PER_LB) - $sql .= "', ibu_gal_per_lb='" . floatval($fermentable->IBU_GAL_PER_LB); ($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; if ($fermentable->INVENTORY) $sql .= "', inventory='" . floatval($fermentable->INVENTORY); @@ -714,8 +712,20 @@ $famount = floatval($fermentable->AMOUNT); $fermentables .= ',"f_amount":' . $famount; $fermentables .= ',"f_cost":' . floatval($fermentable->COST); - $ftype = mysqli_real_escape_string($db, $fermentable->TYPE); - $fermentables .= ',"f_type":"' . $ftype . '"'; + + if ($fermentable->TYPE == 'Grain') + $fermentables .= ',"f_type":0'; + else if ($fermentable->TYPE == 'Sugar') + $fermentables .= ',"f_type":1'; + else if ($fermentable->TYPE == 'Extract') + $fermentables .= ',"f_type":2'; + else if ($fermentable->TYPE == 'Dry extract') + $fermentables .= ',"f_type":3'; + else if ($fermentable->TYPE == 'Adjunct') + $fermentables .= ',"f_type":4'; + else + echo "Unknown TYPE " . $fermentable->TYPE . PHP_EOL; + $fyield = floatval($fermentable->YIELD); $fermentables .= ',"f_yield":' . $fyield; if ($fermentable->COLOR) { @@ -748,17 +758,37 @@ $fermentables .= ',"f_max_in_batch":' . floatval($fermentable->MAX_IN_BATCH); else $fermentables .= ',"f_max_in_batch":100.0'; - $fgraintype = mysqli_real_escape_string($db, $fermentable->GRAINTYPE); - if ($fermentable->GRAINTYPE) - $fgraintype = mysqli_real_escape_string($db, $fermentable->GRAINTYPE); + + if ($fermentable->GRAINTYPE == 'Base') + $fermentables .= ',"f_graintype":0'; + else if ($fermentable->GRAINTYPE == 'Roast') + $fermentables .= ',"f_graintype":1'; + else if ($fermentable->GRAINTYPE == 'Crystal') + $fermentables .= ',"f_graintype":2'; + else if ($fermentable->GRAINTYPE == 'Kilned') + $fermentables .= ',"f_graintype":3'; + else if ($fermentable->GRAINTYPE == 'Sour malt') + $fermentables .= ',"f_graintype":4'; + else if ($fermentable->GRAINTYPE == 'Special') + $fermentables .= ',"f_graintype":5'; + else if ($fermentable->GRAINTYPE == 'No malt') + $fermentables .= ',"f_graintype":6'; else - $fgraintype = "Base"; - $fermentables .= ',"f_graintype":"' . $fgraintype . '"'; - if ($fermentable->ADDED) - $fadded = mysqli_real_escape_string($db, $fermentable->ADDED); + echo "Unknown GRAINTYPE " . $fermentable->GRAINTYPE . PHP_EOL; + + if ($fermentable->ADDED == 'Mash') + $fermentables .= ',"f_added":0'; + else if ($fermentable->ADDED == 'Boil') + $fermentables .= ',"f_added":1'; + else if ($fermentable->ADDED == 'Fermentation') + $fermentables .= ',"f_added":2'; + else if ($fermentable->ADDED == 'Lagering') + $fermentables .= ',"f_added":3'; + else if ($fermentable->ADDED == 'Bottle') + $fermentables .= ',"f_added":4'; else - $fadded = "Mash"; - $fermentables .= ',"f_added":"'.$fadded.'"'; + echo "Unknown ADDED " . $fermentable->ADDED . PHP_EOL; + ($fermentable->ADD_AFTER_BOIL== "TRUE") ? $fermentables .= ',"f_add_after_boil":1' : $fermentables .= ',"f_add_after_boil":0'; ($fermentable->RECOMMEND_MASH== "TRUE") ? $fermentables .= ',"f_recommend_mash":1' : $fermentables .= ',"f_recommend_mash":0'; if ($fermentable->DISSOLVED_PROTEIN) @@ -779,12 +809,12 @@ $fermentables .= "}"; /* Sugars */ $d = $famount * ($fyield / 100) * (1 - $fmoisture / 100); - if ($fadded == "Mash") + if ($fermentable->ADDED == 'Mash') $d = floatval($efficiency) / 100 * $d; $f_sugars += $d; - if ($fgraintype == "Crystal") + if ($fermentable->GRAINTYPE == 'Crystal') $pCara += $percent; - if ($ftype == "Sugar") + if ($fermentable->TYPE == 'Sugar') $pSugar += $percent; } $fermentables .= ']'; @@ -804,9 +834,39 @@ $hops .= '{"h_name":"' . mysqli_real_escape_string($db, $hop->NAME) . '"'; $hops .= ',"h_amount":' . floatval($hop->AMOUNT); $hops .= ',"h_cost":' . floatval($hop->COST); - $hops .= ',"h_type":"' . mysqli_real_escape_string($db, $hop->TYPE) . '"'; - $hops .= ',"h_form":"' . mysqli_real_escape_string($db, $hop->FORM) . '"'; - $hops .= ',"h_useat":"' . mysqli_real_escape_string($db, $hop->USE) . '"'; + + if ($hop->TYPE == 'Bittering') + $hops .= ',"h_type":0'; + else if ($hop->TYPE == 'Aroma') + $hops .= ',"h_type":1'; + else if ($hop->TYPE == 'Both') + $hops .= ',"h_type":2'; + else + echo "Unknown TYPE " . $hop->TYPE . PHP_EOL; + + if ($hop->FORM == 'Pellet') + $hops .= ',"h_form":0'; + else if ($hop->FORM == 'Plug') + $hops .= ',"h_form":1'; + else if ($hop->FORM == 'Leaf') + $hops .= ',"h_form":2'; + else + echo "Unknown FORM " . $hop->FORM . PHP_EOL; + + if ($hop->USE == 'Mash') + $hops .= ',"h_useat":0'; + else if ($hop->USE == 'First wort') + $hops .= ',"h_useat":1'; + else if ($hop->USE == 'Boil') + $hops .= ',"h_useat":2'; + else if ($hop->USE == 'Aroma') + $hops .= ',"h_useat":3'; + else if ($hop->USE == 'Whirlpool') + $hops .= ',"h_useat":4'; + else if ($hop->USE == 'Dry hop') + $hops .= ',"h_useat":5'; + else + echo "Unknown USE " . $hop->USE . PHP_EOL; if ($hop->TIME) $hops .= ',"h_time":' . floatval($hop->TIME); else @@ -855,14 +915,42 @@ $miscs .= ',"m_cost":0'; } } - $miscs .= ',"m_type":"' . mysqli_real_escape_string($db, $misc->TYPE) . '"'; - $miscs .= ',"m_use_use":"' . mysqli_real_escape_string($db, $misc->USE) . '"'; + + if ($misc->TYPE == 'Spice') + $miscs .= ',"m_type":0'; + else if ($misc->TYPE == 'Herb') + $miscs .= ',"m_type":1'; + else if ($misc->TYPE == 'Flavor') + $miscs .= ',"m_type":2'; + else if ($misc->TYPE == 'Fining') + $miscs .= ',"m_type":3'; + else if ($misc->TYPE == 'Water agent') + $miscs .= ',"m_type":4'; + else if ($misc->TYPE == 'Yeast nutrient') + $miscs .= ',"m_type":5'; + else if ($misc->TYPE == 'Other') + $miscs .= ',"m_type":6'; + else + echo "Unknown TYPE " . $misc->TYPE . PHP_EOL; + + if ($misc->USE == 'Starter') + $miscs .= ',"m_use_use":0'; + else if ($misc->USE == 'Mash') + $miscs .= ',"m_use_use":1'; + else if ($misc->USE == 'Boil') + $miscs .= ',"m_use_use":2'; + else if ($misc->USE == 'Primary') + $miscs .= ',"m_use_use":3'; + else if ($misc->USE == 'Secondary') + $miscs .= ',"m_use_use":4'; + else if ($misc->USE == 'Bottling') + $miscs .= ',"m_use_use":5'; + else + echo "Unknown USE " . $misc->USE . PHP_EOL; + ($misc->AMOUNT_IS_WEIGHT== "TRUE") ? $miscs .= ',"m_amount_is_weight":1' : $miscs.= ',"m_amount_is_weight":0'; if ($misc->TIME) { - if (mysqli_real_escape_string($db, $misc->USE) == "Secondary") - $miscs .= ',"m_time":' . floatval($misc->TIME) / 1440; - else - $miscs .= ',"m_time":' . floatval($misc->TIME); + $miscs .= ',"m_time":' . floatval($misc->TIME); } else $miscs .= ',"m_time":0'; $miscs .= "}"; @@ -894,16 +982,46 @@ $yeasts .= ',"y_cost":0'; $yeasts .= ',"y_laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"'; $yeasts .= ',"y_product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"'; - $yeasts .= ',"y_type":"' . mysqli_real_escape_string($db, $yeast->TYPE) . '"'; - $yeasts .= ',"y_form":"' . mysqli_real_escape_string($db, $yeast->FORM) . '"'; + + if ($yeast->TYPE == 'Lager') + $yeasts .= ',"y_type":0'; + else if ($yeast->TYPE == 'Ale') + $yeasts .= ',"y_type":1'; + else if ($yeast->TYPE == 'Wheat') + $yeasts .= ',"y_type":2'; + else if ($yeast->TYPE == 'Wine') + $yeasts .= ',"y_type":3'; + else if ($yeast->TYPE == 'Champagne') + $yeasts .= ',"y_type":4'; + else + echo "Unknown TYPE " . $yeast->TYPE . PHP_EOL; + + if ($yeast->FORM == 'Liquid') { + if ($yeast->LABORATORY == 'Imperial Yeast') + $yeasts .= ',"y_form":0,"y_cells":200000000000'; + else + $yeasts .= ',"y_form":0,"y_cells":100000000000'; + } else if ($yeast->FORM == 'Dry') + $yeasts .= ',"y_form":1,"y_cells":15000000000'; + else if ($yeast->FORM == 'Slant') + $yeasts .= ',"y_form":2,"y_cells":1700000000'; + else if ($yeast->FORM == 'Culture') + $yeasts .= ',"y_form":3,"y_cells":1700000000'; + else if ($yeast->FORM == 'Frozen') + $yeasts .= ',"y_form":4,"y_cells":1700000000'; + else if ($yeast->FORM == 'Bottle') + $yeasts .= ',"y_form":5,"y_cells":1700000000'; + else + echo "Unknown FORM " . $yeast->FORM . PHP_EOL; + ($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"y_amount_is_weight":1' : $yeasts.= ',"y_amount_is_weight":0'; if ($yeast->ADD_TO_SECONDARY=="FALSE") { - $yeasts .= ',"y_use":"Primary"'; + $yeasts .= ',"y_use":0'; // Primary $svg = floatval($yeast->ATTENUATION); } else if ($yeast->PRODUCT_ID=="F2") { - $yeasts .= ',"y_use":"Bottle"'; + $yeasts .= ',"y_use":3'; // Bottle } else { - $yeasts .= ',"y_use":"Secondary"'; + $yeasts .= ',"y_use":1'; // Secondary } $yeasts .= ',"y_min_temperature":' . floatval($yeast->MIN_TEMPERATURE); $yeasts .= ',"y_max_temperature":' . floatval($yeast->MAX_TEMPERATURE); @@ -944,6 +1062,8 @@ return $waters; } + + function recipe_mash_steps($recipe) { global $db; @@ -955,8 +1075,16 @@ $steps .= ','; $comma = TRUE; $steps .= '{"step_name":"' . mysqli_real_escape_string($db, $step->NAME) . '"'; - if ($step->TYPE) - $steps .= ',"step_type":"' . $step->TYPE . '"'; + + if ($step->TYPE == 'Infusion') + $steps .= ',"step_type":0'; + else if ($step->TYPE == 'Temperature') + $steps .= ',"step_type":1'; + else if ($step->TYPE == 'Decoction') + $steps .= ',"step_type":2'; + else + echo "Unknown step TYPE " . $step->TYPE . PHP_EOL; + if ($step->INFUSE_AMOUNT) $steps .= ',"step_infuse_amount":"' . floatval($step->INFUSE_AMOUNT) . '"'; if ($step->STEP_TEMP) @@ -1010,10 +1138,16 @@ $sql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); else $sql .= "', notes='"; - if ($recipe->TYPE) - $sql .= "', type='" . mysqli_real_escape_string($db, $recipe->TYPE); + + if ($recipe->TYPE == 'Extract') + $sql .= "', type='0"; + else if ($recipe->TYPE == 'Partial Mash') + $sql .= "', type='1"; + else if ($recipe->TYPE == 'All Grain') + $sql .= "', type='2"; else - $sql .= "', type='"; + echo "Unknown TYPE " . $recipe->TYPE . PHP_EOL; + if ($recipe->BATCH_SIZE) $batch_size = floatval($recipe->BATCH_SIZE); $sql .= "', batch_size='" . $batch_size; @@ -1030,12 +1164,26 @@ /* Don't use $recipe->EST_OG but recalculate it */ /* Don't use $recipe->EST_FG but recalculate it */ /* Don't use $recipe->EST_COLOR but recalculate it */ - if ($recipe->COLOR_METHOD) - $sql .= "', color_method='" . mysqli_real_escape_string($db, $recipe->COLOR_METHOD); + if ($recipe->COLOR_METHOD == 'Morey') + $sql .= "', color_method='0"; + else if ($recipe->COLOR_METHOD == 'Mosher') + $sql .= "', color_method='1"; + else if ($recipe->COLOR_METHOD == 'Daniels') + $sql .= "', color_method='2"; + else + echo "Unknown COLOR_METHO " . $recipe->COLOR_METHOD . PHP_EOL; + if ($recipe->IBU) $sql .= "', est_ibu='" . floatval($recipe->IBU); - if ($recipe->IBU_METHOD) - $sql .= "', ibu_method='" . mysqli_real_escape_string($db, $recipe->IBU_METHOD); + if ($recipe->IBU_METHOD == 'Tinseth') + $sql .= "', ibu_method='0"; + else if ($recipe->IBU_METHOD == 'Rager') + $sql .= "', ibu_method='1"; + else if ($recipe->IBU_METHOD == 'Daniels') + $sql .= "', ibu_method='2"; + else + echo "Unknown IBU_METHOD " . $recipe->IBU_METHOD . PHP_EOL; + if ($recipe->CARBONATION) $sql .= "', est_carb='" . floatval($recipe->CARBONATION); @@ -1049,13 +1197,13 @@ $sql .= "', mash_ph='" . floatval($recipe->TARGET_PH); } if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Lactic")) { - $sql .= "', sparge_acid_type='Melkzuur"; + $sql .= "', sparge_acid_type='0"; } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Hydrochloric")) { - $sql .= "', sparge_acid_type='Zoutzuur"; + $sql .= "', sparge_acid_type='1"; } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Phosphoric")) { - $sql .= "', sparge_acid_type='Fosforzuur"; + $sql .= "', sparge_acid_type='2"; } else if ($recipe->SPARGE_ACID_TYPE && ($recipe->SPARGE_ACID_TYPE == "Sulfuric")) { - $sql .= "', sparge_acid_type='Zwavelzuur"; + $sql .= "', sparge_acid_type='3"; } if ($recipe->ACID_SPARGE_PERC) { $sql .= "', sparge_acid_perc='" . floatval($recipe->ACID_SPARGE_PERC);