diff -r 22271f3598ac -r acb2d8098f19 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Thu Aug 16 17:17:40 2018 +0200 +++ b/www/import/from_brouwhulp.php Fri Aug 17 15:20:56 2018 +0200 @@ -57,10 +57,10 @@ $sql .= "', protein='" . $fermentable->PROTEIN; if ($fermentable->MAX_IN_BATCH) $sql .= "', max_in_batch='" . $fermentable->MAX_IN_BATCH; - ($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='Y" : $sql .= "', recommend_mash='N"; + ($fermentable->RECOMMEND_MASH == "TRUE") ? $sql .= "', recommend_mash='1" : $sql .= "', recommend_mash='0"; if ($fermentable->IBU_GAL_PER_LB) $sql .= "', ibu_gal_per_lb='" . $fermentable->IBU_GAL_PER_LB; - ($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N"; + ($fermentable->ALWAYS_ON_STOCK == "TRUE") ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; if ($fermentable->INVENTORY) $sql .= "', inventory='" . $fermentable->INVENTORY; if ($fermentable->COST) @@ -116,7 +116,7 @@ $sql .= "', notes='" . mysqli_real_escape_string($db, $hop->NOTES); $sql .= "', origin='" . mysqli_real_escape_string($db, $hop->ORIGIN); $sql .= "', substitutes='" . mysqli_real_escape_string($db, $hop->SUBSTITUTES); - ($hop->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N"; + ($hop->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; if ($hop->INVENTORY) $sql .= "', inventory='" . $hop->INVENTORY; if ($hop->COST) @@ -201,12 +201,13 @@ if (($water->NAME == "Gedemineraliseerd water") || ($water->NAME == "Cristalline") || ($water->NAME == "Montille (Delhaize)") || ($water->NAME == "Spa Reine") || ($water->NAME == "Velsen") || ($water->NAME == "Zutphen") || ($water->NAME == "Aurele Bronwater (Colruyt)")) { - $sql = "INSERT INTO inventory_water_sources SET name='" . mysqli_real_escape_string($db, $water->NAME); + $sql = "INSERT INTO inventory_water_sources SET name='" . mysqli_real_escape_string($db, $water->NAME); + ($water->DEFAULT_WATER == 'TRUE') ? $sql .= "', default_water='1" : $sql .= "', default_water='0"; } else { $sql = "INSERT INTO inventory_water_profiles SET name='" . mysqli_real_escape_string($db, $water->NAME); } - ($water->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N"; + ($water->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; if ($water->NOTES) $sql .= "', notes='" . mysqli_real_escape_string($db, $water->NOTES); $sql .= "', calcium='" . $water->CALCIUM; @@ -218,7 +219,6 @@ $sql .= "', ph='" . $water->PH; if ($water->TOTAL_ALKALINITY) $sql .= "', total_alkalinity='" . $water->TOTAL_ALKALINITY; - ($water->DEFAULT_WATER == 'TRUE') ? $sql .= "', default_water='Y" : $sql .= "', default_water='N"; $sql .= "';"; if (! $result = mysqli_query($db, $sql)) { printf("Error: %s\n", mysqli_error($db)); @@ -248,12 +248,11 @@ $sql .= "', type='" . $misc->TYPE; $sql .= "', use_use='" . $misc->USE; $sql .= "', time='" . $misc->TIME; - $sql .= "', amount='" . $misc->AMOUNT; - ($misc->AMOUNT_IS_WEIGHT == 'TRUE') ? $sql .= "', amount_is_weight='Y" : $sql .= "', amount_is_weight='N"; + ($misc->AMOUNT_IS_WEIGHT == 'TRUE') ? $sql .= "', amount_is_weight='1" : $sql .= "', amount_is_weight='0"; if ($misc->USE_FOR) $sql .= "', use_for='" . mysqli_real_escape_string($db, $misc->USE_FOR); if ($misc->ALWAYS_ON_STOCK) - ($misc->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='Y" : $sql .= "', always_on_stock='N"; + ($misc->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0"; if ($misc->INVENTORY) $sql .= "', inventory='" . $misc->INVENTORY; if ($misc->COST) @@ -297,7 +296,7 @@ */ $sql .= "', evap_rate='" . ($equipment->EVAP_RATE * $equipment->BOIL_SIZE) / 100.0; $sql .= "', boil_time='" . $equipment->BOIL_TIME; - ($equipment->CALC_BOIL_VOLUME == 'TRUE') ? $sql .= "', calc_boil_volume='Y" : $sql .= "', calc_boil_volume='N"; + ($equipment->CALC_BOIL_VOLUME == 'TRUE') ? $sql .= "', calc_boil_volume='1" : $sql .= "', calc_boil_volume='0"; $sql .= "', lauter_deadspace='" . $equipment->LAUTER_DEADSPACE; $sql .= "', top_up_kettle='" . $equipment->TOP_UP_KETTLE; $sql .= "', hop_utilization='" . $equipment->HOP_UTILIZATION; @@ -408,7 +407,7 @@ $sql .= "', tun_weight='" . $mash->TUN_WEIGHT; if ($mash->TUN_SPECIFIX_HEAT) $sql .= "', tun_specific_heat='" . $mash->TUN_SPECIFIC_HEAT; - ($mash->EQUIP_ADJUST == 'TRUE') ? $sql .= "', equip_adjust='Y" : $sql .= "', equip_adjust='N"; + ($mash->EQUIP_ADJUST == 'TRUE') ? $sql .= "', equip_adjust='1" : $sql .= "', equip_adjust='0"; $sql .= "';"; /* * Store the record and get the record number that is created. @@ -454,9 +453,9 @@ //do_fermentables(); //do_hops(); -do_yeasts(); -//do_waters(); +//do_yeasts(); //do_miscs(); +do_waters(); //do_equipments(); //do_styles(); //do_mash();