Mercurial > bms / file diff

--- a/www/import/from_brouwhulp.php	Wed Aug 29 16:23:57 2018 +0200
+++ b/www/import/from_brouwhulp.php	Wed Aug 29 17:10:31 2018 +0200
@@ -181,7 +181,7 @@
 	global $brouwhulp, $db;
 
 	echo "  Start adding waters to the database\n";
-	$sql = "TRUNCATE TABLE inventory_water_profiles;";
+	$sql = "TRUNCATE TABLE profile_water;";
 	if (! $result = mysqli_query($db, $sql)) {
 		printf("Error: %s\n", mysqli_error($db));
 	}
@@ -201,7 +201,7 @@
 		    ($water->DEFAULT_WATER == 'TRUE') ? $sql .= "', default_water='1" : $sql .= "', default_water='0";
 		    ($water->ALWAYS_ON_STOCK == 'TRUE') ? $sql .= "', always_on_stock='1" : $sql .= "', always_on_stock='0";
 		} else {
-			$sql  = "INSERT INTO inventory_water_profiles SET name='" . mysqli_real_escape_string($db, $water->NAME);
+			$sql  = "INSERT INTO profile_water SET name='" . mysqli_real_escape_string($db, $water->NAME);
 		}
 
 		if ($water->NOTES)
@@ -322,7 +322,7 @@
 	global $brouwhulp, $db;
 
 	echo "  Start adding styles to the database\n";
-	$sql = "TRUNCATE TABLE inventory_styles;";
+	$sql = "TRUNCATE TABLE profile_styles;";
 	if (! $result = mysqli_query($db, $sql)) {
 		printf("Error: %s\n", mysqli_error($db));
 	}
@@ -331,7 +331,7 @@
 
 	foreach ($styles->STYLE as $style) {
 
-		$sql  = "INSERT INTO inventory_styles SET name='" . mysqli_real_escape_string($db, $style->NAME);
+		$sql  = "INSERT INTO profile_styles SET name='" . mysqli_real_escape_string($db, $style->NAME);
 		if ($style->NOTES)
 			$sql .= "', notes='" . mysqli_real_escape_string($db, $style->NOTES);
 		if ($style->CATEGORY)
@@ -376,7 +376,7 @@
 	global $brouwhulp, $db;
 
 	echo "  Start adding mash profiles to the database\n";
-	$sql = "TRUNCATE TABLE inventory_mash_profiles;";
+	$sql = "TRUNCATE TABLE profile_mash;";
 	if (! $result = mysqli_query($db, $sql)) {
 		printf("Error: %s\n", mysqli_error($db));
 	}
@@ -384,7 +384,7 @@
 	$mashes = simplexml_load_file($brouwhulp . '/mashs.xml');
 
 	foreach ($mashes->MASH as $mash) {
-		$sql  = "INSERT INTO inventory_mash_profiles SET name='" . mysqli_real_escape_string($db, $mash->NAME);
+		$sql  = "INSERT INTO profile_mash SET name='" . mysqli_real_escape_string($db, $mash->NAME);
 		if ($mash->NOTES)
 			$sql .= "', notes='" . mysqli_real_escape_string($db, $mash->NOTES);
 
@@ -433,8 +433,8 @@
 do_hops();
 do_yeasts();
 do_miscs();
-//do_waters();
-//do_equipments();
+do_waters();
+do_equipments();
 do_styles();
 do_mash();