www/import/from_brouwhulp.php

changeset 51
7224109adfe1
parent 50
6d94167c2697
child 54
294dda7f1779
--- a/www/import/from_brouwhulp.php	Sat Sep 01 22:24:09 2018 +0200
+++ b/www/import/from_brouwhulp.php	Tue Sep 04 13:44:02 2018 +0200
@@ -478,11 +478,46 @@
 
 		if ($recipe->STYLE) {
 			if ($recipe->STYLE->NAME)
-				$sql .= "', style_name='" . mysqli_real_escape_string($db, $recipe->STYLE->NAME);
+				$sql .= "', st_name='" . mysqli_real_escape_string($db, $recipe->STYLE->NAME);
 			if ($recipe->STYLE->STYLE_LETTER)
-				$sql .= "', style_letter='" . mysqli_real_escape_string($db, $recipe->STYLE->STYLE_LETTER);
-			if ($recipe->STYLE->STYLE_GUIDE)
-				$sql .= "', style_guide='" . mysqli_real_escape_string($db, $recipe->STYLE->STYLE_GUIDE);
+				$sql .= "', st_letter='" . mysqli_real_escape_string($db, $recipe->STYLE->STYLE_LETTER);
+			if ($recipe->STYLE->STYLE_GUIDE) {
+				if ($recipe->STYLE->STYLE_GUIDE == "Biertypengids Derek Walsh") {
+					$sql .= "', st_guide='BKG 2015";
+				} else if ($recipe->STYLE->STYLE_GUIDE == "BKG Biertypen") {
+					$sql .= "', st_guide='BKG 2015";
+				} else {
+					$sql .= "', st_guide='" . mysqli_real_escape_string($db, $recipe->STYLE->STYLE_GUIDE);
+				}
+			}
+			if ($recipe->STYLE->OG_MIN)
+				$sql .= "', st_og_min='" . floatval($recipe->STYLE->OG_MIN);
+			if ($recipe->STYLE->OG_MAX)
+				$sql .= "', st_og_max='" . floatval($recipe->STYLE->OG_MAX);
+			if ($recipe->STYLE->FG_MIN)
+				$sql .= "', st_fg_min='" . floatval($recipe->STYLE->FG_MIN);
+			if ($recipe->STYLE->FG_MAX)
+				$sql .= "', st_fg_max='" . floatval($recipe->STYLE->FG_MAX);
+			if ($recipe->STYLE->IBU_MIN)
+				$sql .= "', st_ibu_min='" . floatval($recipe->STYLE->IBU_MIN);
+			if ($recipe->STYLE->IBU_MAX)
+				$sql .= "', st_ibu_max='" . floatval($recipe->STYLE->IBU_MAX);
+			if ($recipe->STYLE->COLOR_MIN) {
+				$srm = floatval($recipe->STYLE->COLOR_MIN);
+				$sql .= "', st_color_min='" . srm_to_ebc($srm);
+			}
+			if ($recipe->STYLE->COLOR_MAX) {
+				$srm = floatval($recipe->STYLE->COLOR_MAX);
+				$sql .= "', st_color_max='" . srm_to_ebc($srm);
+			}
+			if ($recipe->STYLE->CARB_MIN)
+				$sql .= "', st_carb_min='" . floatval($recipe->STYLE->CARB_MIN);
+			if ($recipe->STYLE->CARB_MAX)
+				$sql .= "', st_carb_max='" . floatval($recipe->STYLE->CARB_MAX);
+			if ($recipe->STYLE->ABV_MIN)
+				$sql .= "', st_abv_min='" . floatval($recipe->STYLE->ABV_MIN);
+			if ($recipe->STYLE->ABV_MAX)
+				$sql .= "', st_abv_max='" . floatval($recipe->STYLE->ABV_MAX);
 		}
 
 		/*
@@ -495,43 +530,43 @@
 				if ($comma)
 					$fermentables .= ',';
 				$comma = TRUE;
-				$fermentables .= '{"name":"' . mysqli_real_escape_string($db, $fermentable->NAME) . '"';
-				$fermentables .= ',"amount":' . floatval($fermentable->AMOUNT);
-				$fermentables .= ',"cost":' . floatval($fermentable->COST);
-				$fermentables .= ',"type":"' . mysqli_real_escape_string($db, $fermentable->TYPE) . '"';
-				$fermentables .= ',"yield":' . floatval($fermentable->YIELD);
+				$fermentables .= '{"f_name":"' . mysqli_real_escape_string($db, $fermentable->NAME) . '"';
+				$fermentables .= ',"f_amount":' . floatval($fermentable->AMOUNT);
+				$fermentables .= ',"f_cost":' . floatval($fermentable->COST);
+				$fermentables .= ',"f_type":"' . mysqli_real_escape_string($db, $fermentable->TYPE) . '"';
+				$fermentables .= ',"f_yield":' . floatval($fermentable->YIELD);
 				if ($fermentable->COLOR) {
 					$srm = floatval($fermentable->COLOR);
 					$ebc = srm_to_ebc($srm);
-					$fermentables .= ',"color":' . $ebc;
+					$fermentables .= ',"f_color":' . $ebc;
 				}
 				if ($fermentable->COARSE_FINE_DIFF) {
-					$fermentables .= ',"coarse_fine_diff":' . floatval($fermentable->COARSE_FINE_DIFF);
+					$fermentables .= ',"f_coarse_fine_diff":' . floatval($fermentable->COARSE_FINE_DIFF);
 				}
 				if ($fermentable->MOISTURE) {
-					$fermentables .= ',"moisture":' . floatval($fermentable->MOISTURE);
+					$fermentables .= ',"f_moisture":' . floatval($fermentable->MOISTURE);
 				}
 				if ($fermentable->DIASTATIC_POWER) {
-				        $fermentables .= ',"diastatic_power":' . floatval($fermentable->DIASTATIC_POWER);
+				        $fermentables .= ',"f_diastatic_power":' . floatval($fermentable->DIASTATIC_POWER);
 				}
 				if ($fermentable->PROTEIN) {
-					$fermentables .= ',"protein":' . floatval($fermentable->PROTEIN);
+					$fermentables .= ',"f_protein":' . floatval($fermentable->PROTEIN);
 				}
 				if ($fermentable->MAX_IN_BATCH) {
-					$fermentables .= ',"max_in_batch":' . floatval($fermentable->MAX_IN_BATCH);
+					$fermentables .= ',"f_max_in_batch":' . floatval($fermentable->MAX_IN_BATCH);
 				}
 				if ($fermentable->GRAINTYPE) {
-					$fermentables .= ',"graintype":"' . mysqli_real_escape_string($db, $fermentable->GRAINTYPE) . '"';
+					$fermentables .= ',"f_graintype":"' . mysqli_real_escape_string($db, $fermentable->GRAINTYPE) . '"';
 				}
 				if ($fermentable->ADDED) {
-					$fermentables .= ',"added":"' . mysqli_real_escape_string($db, $fermentable->ADDED) . '"';
+					$fermentables .= ',"f_added":"' . mysqli_real_escape_string($db, $fermentable->ADDED) . '"';
 				}
 				if ($fermentable->DISSOLVED_PROTEIN) {
-					$fermentables .= ',"dissolved_protein":' . floatval($fermentable->DISSOLVED_PROTEIN);
+					$fermentables .= ',"f_dissolved_protein":' . floatval($fermentable->DISSOLVED_PROTEIN);
 				}
-				($fermentable->ADJUST_TO_TOTAL_100 == "TRUE") ? $fermentables .= ',"adjust_to_total_100":true' : $fermentables .= ',"adjust_to_total_100":false';
+				($fermentable->ADJUST_TO_TOTAL_100 == "TRUE") ? $fermentables .= ',"f_adjust_to_total_100":true' : $fermentables .= ',"f_adjust_to_total_100":false';
 				if ($fermentable->DI_pH) {
-					$fermentables .= ',"di_ph":' . floatval($fermentable->DI_pH);
+					$fermentables .= ',"f_di_ph":' . floatval($fermentable->DI_pH);
 				}
 				$fermentables .= "}";
 			}
@@ -553,23 +588,23 @@
 				if ($comma)
 					$hops .= ',';
 				$comma = TRUE;
-				$hops .= '{"name":"' . mysqli_real_escape_string($db, $hop->NAME) . '"';
-				$hops .= ',"amount":' . floatval($hop->AMOUNT);
-				$hops .= ',"cost":' . floatval($hop->COST);
-				$hops .= ',"type":"' . mysqli_real_escape_string($db, $hop->TYPE) . '"';
-				$hops .= ',"form":"' . mysqli_real_escape_string($db, $hop->FORM) . '"';
-				$hops .= ',"use":"' . mysqli_real_escape_string($db, $hop->USE) . '"';
+				$hops .= '{"h_name":"' . mysqli_real_escape_string($db, $hop->NAME) . '"';
+				$hops .= ',"h_amount":' . floatval($hop->AMOUNT);
+				$hops .= ',"h_cost":' . floatval($hop->COST);
+				$hops .= ',"h_type":"' . mysqli_real_escape_string($db, $hop->TYPE) . '"';
+				$hops .= ',"h_form":"' . mysqli_real_escape_string($db, $hop->FORM) . '"';
+				$hops .= ',"h_use":"' . mysqli_real_escape_string($db, $hop->USE) . '"';
 				if ($hop->TIME)
-					$hops .= ',"time":' . floatval($hop->TIME);
-				$hops .= ',"alpha":' . floatval($hop->ALPHA);
-				$hops .= ',"beta":' . floatval($hop->BETA);
-				$hops .= ',"hsi":' . floatval($hop->HSI);
-				$hops .= ',"humulene":' . floatval($hop->HUMULENE);
-				$hops .= ',"carophyllene":' . floatval($hop->CAROPHYLLENE);
-				$hops .= ',"cohumulone":' . floatval($hop->COHUMULONE);
-				$hops .= ',"myrcene":' . floatval($hop->MYRCENE);
+					$hops .= ',"h_time":' . floatval($hop->TIME);
+				$hops .= ',"h_alpha":' . floatval($hop->ALPHA);
+				$hops .= ',"h_beta":' . floatval($hop->BETA);
+				$hops .= ',"h_hsi":' . floatval($hop->HSI);
+				$hops .= ',"h_humulene":' . floatval($hop->HUMULENE);
+				$hops .= ',"h_carophyllene":' . floatval($hop->CAROPHYLLENE);
+				$hops .= ',"h_cohumulone":' . floatval($hop->COHUMULONE);
+				$hops .= ',"h_myrcene":' . floatval($hop->MYRCENE);
 				if ($hop->TOTAL_OIL)
-					$hops .= ',"total_oil":' . floatval($hop->TOTAL_OIL);
+					$hops .= ',"h_total_oil":' . floatval($hop->TOTAL_OIL);
 				$hops .= "}";
 			}
 
@@ -590,15 +625,15 @@
 				if ($comma)
 					$miscs .= ',';
 				$comma = TRUE;
-				$miscs .= '{"name":"' . mysqli_real_escape_string($db, $misc->NAME) . '"';
-				$miscs .= ',"amount":' . floatval($misc->AMOUNT);
+				$miscs .= '{"m_name":"' . mysqli_real_escape_string($db, $misc->NAME) . '"';
+				$miscs .= ',"m_amount":' . floatval($misc->AMOUNT);
 				if ($misc->COST)
-					$miscs .= ',"cost":' . floatval($misc->COST);
-				$miscs .= ',"type":"' . mysqli_real_escape_string($db, $misc->TYPE) . '"';
-				$miscs .= ',"use":"' . mysqli_real_escape_string($db, $misc->USE) . '"';
-				($misc->AMOUNT_IS_WEIGHT== "TRUE") ? $miscs .= ',"amount_is_weight":true' : $miscs.= ',"amount_is_weight":false';
+					$miscs .= ',"m_cost":' . floatval($misc->COST);
+				$miscs .= ',"m_type":"' . mysqli_real_escape_string($db, $misc->TYPE) . '"';
+				$miscs .= ',"m_use":"' . mysqli_real_escape_string($db, $misc->USE) . '"';
+				($misc->AMOUNT_IS_WEIGHT== "TRUE") ? $miscs .= ',"m_amount_is_weight":true' : $miscs.= ',"m_amount_is_weight":false';
 				if ($misc->TIME)
-					$miscs .= ',"time":' . floatval($misc->TIME);
+					$miscs .= ',"m_time":' . floatval($misc->TIME);
 				$miscs .= "}";
 			}
 
@@ -619,21 +654,21 @@
 				if ($comma)
 					$yeasts .= ',';
 				$comma = TRUE;
-				$yeasts .= '{"name":"' . mysqli_real_escape_string($db, $yeast->NAME) . '"';
-				$yeasts .= ',"amount":' . floatval($yeast->AMOUNT);
+				$yeasts .= '{"y_name":"' . mysqli_real_escape_string($db, $yeast->NAME) . '"';
+				$yeasts .= ',"y_amount":' . floatval($yeast->AMOUNT);
 				if ($yeast->COST)
-					$yeasts .= ',"cost":' . floatval($yeast->COST);
-				$yeasts .= ',"laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"';
-				$yeasts .= ',"product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"';
-				$yeasts .= ',"type":"' . mysqli_real_escape_string($db, $yeast->TYPE) . '"';
-				$yeasts .= ',"form":"' . mysqli_real_escape_string($db, $yeast->FORM) . '"';
-				($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"amount_is_weight":true' : $yeasts.= ',"amount_is_weight":false';
+					$yeasts .= ',"y_cost":' . floatval($yeast->COST);
+				$yeasts .= ',"y_laboratory":"' . mysqli_real_escape_string($db, $yeast->LABORATORY) . '"';
+				$yeasts .= ',"y_product_id":"' . mysqli_real_escape_string($db, $yeast->PRODUCT_ID) . '"';
+				$yeasts .= ',"y_type":"' . mysqli_real_escape_string($db, $yeast->TYPE) . '"';
+				$yeasts .= ',"y_form":"' . mysqli_real_escape_string($db, $yeast->FORM) . '"';
+				($yeast->AMOUNT_IS_WEIGHT== "TRUE") ? $yeasts .= ',"y_amount_is_weight":true' : $yeasts.= ',"y_amount_is_weight":false';
 				if ($yeast->ADD_TO_SECONDARY=="FALSE") {
-					$yeasts .= ',"use":"Primary"';
+					$yeasts .= ',"y_use":"Primary"';
 				} else if ($yeast->PRODUCT_ID=="F2") {
-					$yeasts .= ',"use":"Bottle"';
+					$yeasts .= ',"y_use":"Bottle"';
 				} else {
-					$yeasts .= ',"use":"Secondary"';
+					$yeasts .= ',"y_use":"Secondary"';
 				}
 				$yeasts .= "}";
 			}
@@ -655,24 +690,29 @@
 				if ($comma)
 					$waters .= ',';
 				$comma = TRUE;
-				$waters .= '{"name":"' . mysqli_real_escape_string($db, $water->NAME) . '"';
-				$waters .= ',"amount":' . floatval($water->AMOUNT);
+				$waters .= '{"w_name":"' . mysqli_real_escape_string($db, $water->NAME) . '"';
+				$waters .= ',"w_amount":' . floatval($water->AMOUNT);
 				if ($water->CALCIUM)
-					$waters .= ',"calcium":' . floatval($water->CALCIUM);
+					$waters .= ',"w_calcium":' . floatval($water->CALCIUM);
 				if ($water->BICARBONATE)
-					$waters .= ',"bicarbonate":' . floatval($water->BICARBONATE);
+					$waters .= ',"w_bicarbonate":' . floatval($water->BICARBONATE);
 				if ($water->SULFATE)
-					$waters .= ',"sulfate":' . floatval($water->SULFATE);
+					$waters .= ',"w_sulfate":' . floatval($water->SULFATE);
 				if ($water->CHLORIDE)
-					$waters .= ',"chloride":' . floatval($water->CHLORIDE);
+					$waters .= ',"w_chloride":' . floatval($water->CHLORIDE);
 				if ($water->SODIUM)
-					$waters .= ',"sodium":' . floatval($water->SODIUM);
+					$waters .= ',"w_sodium":' . floatval($water->SODIUM);
 				if ($water->MAGNESIUM)
-					$waters .= ',"magnesium":' . floatval($water->MAGNESIUM);
+					$waters .= ',"w_magnesium":' . floatval($water->MAGNESIUM);
 				if ($water->PH)
-					$waters .= ',"ph":' . floatval($water->PH);
+					$waters .= ',"w_ph":' . floatval($water->PH);
 				if ($water->TOTAL_ALKALINITY)
-					$waters .= ',"total_alkalinity":' . floatval($water->TOTAL_ALKALINITY);
+					$waters .= ',"w_total_alkalinity":' . floatval($water->TOTAL_ALKALINITY);
+				if ($water->COST)
+					$waters .= ',"w_cost":' . floatval($water->COST);
+				else
+					$waters .= ',"w_cost":0.00';
+				($water->DEFAULT_WATER== "TRUE") ? $waters .= ',"w_default_water":true' : $waters.= ',"w_default_water":false';
 				$waters .= "}";
 			}
 
@@ -687,44 +727,39 @@
 		 * Put the mash in a json array
 		 */
 		if ($recipe->MASH) {
-			$mash  = '{"sparge_temp":' . floatval($recipe->MASH->SPARGE_TEMP);
-			$mash .= ',"ph":' . floatval($recipe->MASH->PH);
+			$sql .= "',mash_sparge_temp='" . floatval($recipe->MASH->SPARGE_TEMP);
+			$sql .= "',mash_ph='" . floatval($recipe->MASH->PH);
 			if ($recipe->MASH->NAME)
-				$mash .= ',"name":"' . mysqli_real_escape_string($db, $recipe->MASH->NAME) . '"';
+				$sql .= "',mash_name='" . mysqli_real_escape_string($db, $recipe->MASH->NAME);
+
 			if ($recipe->MASH->MASH_STEPS) {
-				$steps = ',"mash_steps":[';
+				$steps = '[';
 				$comma = FALSE;
 				foreach ($recipe->MASH->MASH_STEPS->MASH_STEP as $step) {
 					if ($comma)
 						$steps .= ',';
 					$comma = TRUE;
 					$steps .= '{"step_name":"' . mysqli_real_escape_string($db, $step->NAME) . '"';
-					if ($step->TYPE) {
+					if ($step->TYPE)
 						$steps .= ',"step_type":"' . $step->TYPE . '"';
-					}
-					if ($step->STEP_TEMP) {
-						$steps .= ',"step_temp":"' . $step->STEP_TEMP . '"';
-					}
-					if ($step->STEP_TIME) {
-						$steps .= ',"step_time":"' . $step->STEP_TIME . '"';
-					}
-					if ($step->RAMP_TIME) {
-						$steps .= ',"ramp_time":"' . $step->RAMP_TIME . '"';
-					}
-					if ($step->END_TEMP) {
-						$steps .= ',"end_temp":"' . $step->END_TEMP . '"';
-					}
+					if ($step->INFUSE_AMOUNT)
+						$steps .= ',"step_infuse_amount":"' . floatval($step->INFUSE_AMOUNT) . '"';
+					if ($step->STEP_TEMP)
+						$steps .= ',"step_temp":"' . floatval($step->STEP_TEMP) . '"';
+					if ($step->STEP_TIME)
+						$steps .= ',"step_time":"' . floatval($step->STEP_TIME) . '"';
+					if ($step->RAMP_TIME)
+						$steps .= ',"ramp_time":"' . floatval($step->RAMP_TIME) . '"';
+					if ($step->END_TEMP)
+						$steps .= ',"end_temp":"' . floatval($step->END_TEMP) . '"';
 					$steps .= "}";
 				}
 				$steps .= ']';
-				$mash .= $steps;
+//				echo $steps . PHP_EOL;
+				$sql .= "', json_mashs='" . $steps;
+				if (strlen($steps) > $len_mash)
+					$len_mash = strlen($steps);
 			}
-
-			$mash .= '}';
-//			echo $mash . PHP_EOL;
-			$sql .= "', json_mash='" . $mash;
-			if (strlen($mash) > $len_mash)
-				$len_mash = strlen($mash);
 		}
 
 		$sql .= "';";

mercurial