diff -r d202777ebae5 -r 2ac491548d8d www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Mon Jan 21 20:45:18 2019 +0100 +++ b/www/import/from_brouwhulp.php Tue Jan 22 20:27:45 2019 +0100 @@ -51,15 +51,37 @@ foreach ($myfermentables->FERMENTABLE as $fermentable) { $sql = "INSERT INTO inventory_fermentables SET name='" . mysqli_real_escape_string($db, $fermentable->NAME); - $sql .= "', type='" . $fermentable->TYPE; + if ($fermentable->TYPE == 'Grain') + $sql .= "', type='0"; + else if ($fermentable->TYPE == 'Sugar') + $sql .= "', type='1"; + else if ($fermentable->TYPE == 'Extract') + $sql .= "', type='2"; + else if ($fermentable->TYPE == 'Dry extract') + $sql .= "', type='3"; + else if ($fermentable->TYPE == 'Adjunct') + $sql .= "', type='4"; + else + echo "Unknown TYPE " . $fermentable->TYPE . PHP_EOL; if ($fermentable->YIELD) $sql .= "', yield='" . floatval($fermentable->YIELD); if ($fermentable->COLOR) { - $srm = floatval($fermentable->COLOR); - $ebc = srm_to_ebc($srm); - $sql .= "', color='" . $ebc; + $sql .= "', color='" . srm_to_ebc(floatval($fermentable->COLOR)); } ($fermentable->ADD_AFTER_BOIL == "TRUE") ? $sql .= "', add_after_boil='1" : $sql .= "', add_after_boil='0"; + if ($fermentable->ADDED == 'Mash') + $sql .= "', added='0"; + else if ($fermentable->ADDED == 'Boil') + $sql .= "', added='1"; + else if ($fermentable->ADDED == 'Fermentation') + $sql .= "', added='2"; + else if ($fermentable->ADDED == 'Lagering') + $sql .= "', added='3"; + else if ($fermentable->ADDED == 'Bottle') + $sql .= "', added='4"; + else + echo "Unknown ADDED " . $fermentable->ADDED . PHP_EOL; + $sql .= "', origin='" . mysqli_real_escape_string($db, $fermentable->ORIGIN); $sql .= "', supplier='" . mysqli_real_escape_string($db, $fermentable->SUPPLIER); $sql .= "', notes='" . mysqli_real_escape_string($db, $fermentable->NOTES); @@ -71,6 +93,8 @@ $sql .= "', diastatic_power='" . floatval($fermentable->DIASTATIC_POWER); if ($fermentable->PROTEIN) $sql .= "', protein='" . floatval($fermentable->PROTEIN); + if ($fermentable->DISSOLVED_PROTEIN) + $sql .= "', dissolved_protein='" . floatval($fermentable->DISSOLVED_PROTEIN); 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"; @@ -88,7 +112,22 @@ $sql .= "', di_ph='" . floatval($fermentable->DI_pH); if ($fermentable->{'ACID_TO_pH_5.7'}) $sql .= "', acid_to_ph_57='" . floatval($fermentable->{'ACID_TO_pH_5.7'}); - $sql .= "', graintype='" . $fermentable->GRAINTYPE; + if ($fermentable->GRAINTYPE == 'Base') + $sql .= "', graintype='0"; + else if ($fermentable->GRAINTYPE == 'Roast') + $sql .= "', graintype='1"; + else if ($fermentable->GRAINTYPE == 'Crystal') + $sql .= "', graintype='2"; + else if ($fermentable->GRAINTYPE == 'Kilned') + $sql .= "', graintype='3"; + else if ($fermentable->GRAINTYPE == 'Sour malt') + $sql .= "', graintype='4"; + else if ($fermentable->GRAINTYPE == 'Special') + $sql .= "', graintype='5"; + else if ($fermentable->GRAINTYPE == 'No malt') + $sql .= "', graintype='6"; + else + echo "Unknown GRAINTYPE " . $fermentable->GRAINTYPE . PHP_EOL; $sql .= "';"; if (! $result = mysqli_query($db, $sql)) { printf("Error: %s\n", mysqli_error($db));