diff -r 895829b91057 -r 0c6ad9e0f143 www/import/from_brouwhulp.php --- a/www/import/from_brouwhulp.php Sat Nov 17 23:29:11 2018 +0100 +++ b/www/import/from_brouwhulp.php Sun Nov 18 22:15:31 2018 +0100 @@ -442,7 +442,7 @@ -function do_recipes() +function do_recipes($brews) { global $brouwhulp, $db; $len_fermentables = 0; @@ -452,13 +452,21 @@ $len_waters = 0; $len_mash = 0; - echo " Start adding recipes to the database\n"; - $sql = "TRUNCATE TABLE recipes;"; + if ($brews) { + echo " Start adding brews to the database\n"; + $sql = "TRUNCATE TABLE production;"; + } else { + echo " Start adding recipes to the database\n"; + $sql = "TRUNCATE TABLE recipes;"; + } if (! $result = mysqli_query($db, $sql)) { printf("Error: %s\n", mysqli_error($db)); } - $recipes= simplexml_load_file($brouwhulp . '/recipes.xml'); + if ($brews) + $recipes = simplexml_load_file($brouwhulp . '/brews.xml'); + else + $recipes = simplexml_load_file($brouwhulp . '/recipes.xml'); foreach ($recipes->RECIPE as $recipe) { $f_sugars = 0; @@ -470,7 +478,10 @@ $svg = 77; $colorw = 0; - $sql = "INSERT INTO recipes SET name='" . mysqli_real_escape_string($db, $recipe->NAME); + if ($brews) + $sql = "INSERT INTO production SET name='" . mysqli_real_escape_string($db, $recipe->NAME); + else + $sql = "INSERT INTO recipes SET name='" . mysqli_real_escape_string($db, $recipe->NAME); if ($recipe->NOTES) $sql .= "', notes='" . mysqli_real_escape_string($db, $recipe->NOTES); else @@ -889,7 +900,8 @@ do_equipments(); do_styles(); do_mash(); -do_recipes(); +do_recipes(0); +//do_recipes(1); mysqli_close($db);