Mercurial > bms / file diff

--- a/www/import/from_brouwhulp.php	Sat Sep 22 22:15:01 2018 +0200
+++ b/www/import/from_brouwhulp.php	Sun Sep 23 17:15:33 2018 +0200
@@ -185,7 +185,7 @@
 	if (! $result = mysqli_query($db, $sql)) {
 		printf("Error: %s\n", mysqli_error($db));
 	}
-	$sql = "TRUNCATE TABLE inventory_water_sources;";
+	$sql = "TRUNCATE TABLE inventory_waters;";
 	if (! $result = mysqli_query($db, $sql)) {
 		printf("Error: %s\n", mysqli_error($db));
 	}
@@ -197,9 +197,8 @@
 		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_waters SET name='" . mysqli_real_escape_string($db, $water->NAME);
 		    ($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 profile_water SET name='" . mysqli_real_escape_string($db, $water->NAME);
 		}
@@ -452,18 +451,32 @@
 		$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
+			$sql .= "', notes='";
 		if ($recipe->TYPE)
 			$sql .= "', type='" . mysqli_real_escape_string($db, $recipe->TYPE);
+		else
+			$sql .= "', type='";
 		if ($recipe->BATCH_SIZE)
 			$sql .= "', batch_size='" . floatval($recipe->BATCH_SIZE);
+		else
+			$sql .= "', batch_size='20.0";
 		if ($recipe->BOIL_TIME)
 			$sql .= "', boil_time='" . floatval($recipe->BOIL_TIME);
+		else
+			$sql .= "', boil_time='90";
 		if ($recipe->EFFICIENCY)
 			$sql .= "', efficiency='" . floatval($recipe->EFFICIENCY);
+		else
+			$sql .= "', efficiency='75";
 		if ($recipe->EST_OG)
 			$sql .= "', est_og='" . floatval($recipe->EST_OG);
+		else
+			$sql .= "', est_og='1.052";
 		if ($recipe->EST_FG)
 			$sql .= "', est_fg='" . floatval($recipe->EST_FG);
+		else
+			$sql .= "', est_fg='1.000";
 		if ($recipe->EST_COLOR) {
 			$srm = floatval($recipe->EST_COLOR);
 			$ebc = srm_to_ebc($srm);
@@ -542,37 +555,46 @@
 					$ebc = srm_to_ebc($srm);
 					$fermentables .= ',"f_color":' . $ebc;
 				}
-				if ($fermentable->COARSE_FINE_DIFF) {
+				if ($fermentable->COARSE_FINE_DIFF)
 					$fermentables .= ',"f_coarse_fine_diff":' . floatval($fermentable->COARSE_FINE_DIFF);
-				}
-				if ($fermentable->MOISTURE) {
+				else
+					$fermentables .= ',"f_coarse_fine_diff":0';
+				if ($fermentable->MOISTURE)
 					$fermentables .= ',"f_moisture":' . floatval($fermentable->MOISTURE);
-				}
-				if ($fermentable->DIASTATIC_POWER) {
+				else
+					$fermentables .= ',"f_moisture":0';
+				if ($fermentable->DIASTATIC_POWER)
 				        $fermentables .= ',"f_diastatic_power":' . floatval($fermentable->DIASTATIC_POWER);
-				}
-				if ($fermentable->PROTEIN) {
+				else
+					$fermentables .= ',"f_diastatic_power":0';
+				if ($fermentable->PROTEIN)
 					$fermentables .= ',"f_protein":' . floatval($fermentable->PROTEIN);
-				}
-				if ($fermentable->MAX_IN_BATCH) {
+				else
+					$fermentables .= ',"f_protein":0';
+				if ($fermentable->MAX_IN_BATCH)
 					$fermentables .= ',"f_max_in_batch":' . floatval($fermentable->MAX_IN_BATCH);
-				}
-				if ($fermentable->GRAINTYPE) {
+				else
+					$fermentables .= ',"f_max_in_batch":100.0';
+				if ($fermentable->GRAINTYPE)
 					$fermentables .= ',"f_graintype":"' . mysqli_real_escape_string($db, $fermentable->GRAINTYPE) . '"';
-				}
-				if ($fermentable->ADDED) {
+				else
+					$fermentables .= ',"f_graintype":"Base"';
+				if ($fermentable->ADDED)
 					$fermentables .= ',"f_added":"' . mysqli_real_escape_string($db, $fermentable->ADDED) . '"';
-				}
+				else
+					$fermentables .= ',"f_added":"Mash"';
 				($fermentable->ADD_AFTER_BOIL== "TRUE") ? $fermentables .= ',"f_add_after_boil":true' : $fermentables .= ',"f_add_after_boil":false';
 				($fermentable->RECOMMEND_MASH== "TRUE") ? $fermentables .= ',"f_recommend_mash":true' : $fermentables .= ',"f_recommend_mash":false';
-				if ($fermentable->DISSOLVED_PROTEIN) {
+				if ($fermentable->DISSOLVED_PROTEIN)
 					$fermentables .= ',"f_dissolved_protein":' . floatval($fermentable->DISSOLVED_PROTEIN);
-				}
+				else
+					$fermentables .= ',"f_dissolved_protein":0';
 				($fermentable->ADJUST_TO_TOTAL_100 == "TRUE") ? $fermentables .= ',"f_adjust_to_total_100":true' : $fermentables .= ',"f_adjust_to_total_100":false';
 				$fermentables .= ',"f_percentage":' . floatval($fermentable->PERCENTAGE);
-				if ($fermentable->DI_pH) {
+				if ($fermentable->DI_pH)
 					$fermentables .= ',"f_di_ph":' . floatval($fermentable->DI_pH);
-				}
+				else
+					$fermentables .= ',"f_di_ph":5.6';
 				$fermentables .= "}";
 			}
 
@@ -788,24 +810,24 @@
 			printf("Error: %s\n", mysqli_error($db));
 		}
 	}
-	echo "Fermentables: " . $len_fermentables . PHP_EOL;
-	echo "Hops:         " . $len_hops . PHP_EOL;
-	echo "Miscs:        " . $len_miscs . PHP_EOL;
-	echo "Yeasts:       " . $len_yeasts . PHP_EOL;
-	echo "Waters:       " . $len_waters . PHP_EOL;
-	echo "Mash:         " . $len_mash . PHP_EOL;
+//	echo "Fermentables: " . $len_fermentables . PHP_EOL;
+//	echo "Hops:         " . $len_hops . PHP_EOL;
+//	echo "Miscs:        " . $len_miscs . PHP_EOL;
+//	echo "Yeasts:       " . $len_yeasts . PHP_EOL;
+//	echo "Waters:       " . $len_waters . PHP_EOL;
+//	echo "Mash:         " . $len_mash . PHP_EOL;
 }
 
 
 
-//do_fermentables();
-//do_hops();
-//do_yeasts();
-//do_miscs();
-//do_waters();
-//do_equipments();
+do_fermentables();
+do_hops();
+do_yeasts();
+do_miscs();
+do_waters();
+do_equipments();
 do_styles();
-//do_mash();
+do_mash();
 do_recipes();