diff -r d9dfd703df83 -r ccbe79db80b8 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Mon Aug 13 16:10:27 2018 +0200 +++ b/www/import/from_brouwhulp.php Mon Aug 13 19:49:42 2018 +0200 @@ -194,12 +194,23 @@ if (! $result = mysqli_query($db, $sql)) { printf("Error: %s\n", mysqli_error($db)); } + $sql = "TRUNCATE TABLE inventory_water_sources;"; + if (! $result = mysqli_query($db, $sql)) { + printf("Error: %s\n", mysqli_error($db)); + } $waters = simplexml_load_file($brouwhulp . '/waters.xml'); foreach ($waters->WATER as $water) { - $sql = "INSERT INTO inventory_water_profiles SET name='" . mysqli_real_escape_string($db, $water->NAME); + 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); + } 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"; if ($water->NOTES) $sql .= "', notes='" . mysqli_real_escape_string($db, $water->NOTES); @@ -446,10 +457,10 @@ -do_fermentables(); -do_hops(); +//do_fermentables(); +//do_hops(); //do_yeasts(); -//do_waters(); +do_waters(); //do_miscs(); //do_equipments(); //do_styles();