Mercurial > bms / file diff

--- a/www/rec_beerxml.php	Fri Oct 18 13:20:35 2019 +0200
+++ b/www/rec_beerxml.php	Fri May 01 16:37:31 2020 +0200
@@ -1,6 +1,4 @@
 <?php
-//require_once('config.php');
-//require_once('includes/formulas.php');
 require_once($_SERVER['DOCUMENT_ROOT'].'/config.php');
 require_once($_SERVER['DOCUMENT_ROOT'].'/includes/formulas.php');
 
@@ -36,6 +34,8 @@
 $misctype = array( 'Spice', 'Herb', 'Flavor', 'Fining', 'Water agent', 'Yeast nutrient', 'Other' );
 $miscuse = array( 'Starter', 'Mash', 'Boil', 'Primary', 'Secondary', 'Bottling' );
 $mashsteptype = array( 'Infusion', 'Temperature', 'Decoction' );
+$colormethod = array( 'Morey', 'Mosher', 'Daniels', 'Halberstadt', 'Naudts' );
+$ibumethod = array( 'Tinseth', 'Rager', 'Daniels', 'Garetz', 'Mosher', 'Noonan' );
 
 
 /*
@@ -87,6 +87,42 @@
 xmlwriter_text($xw, sprintf("%.1f",floatval($row['efficiency'])));
 xmlwriter_end_element($xw);
 
+if (floatval($row['est_og']) > 0) {
+	xmlwriter_start_element($xw, 'EST_OG');
+	xmlwriter_text($xw, sprintf("%.3f",floatval($row['est_og'])));
+	xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_fg']) > 0) {
+        xmlwriter_start_element($xw, 'EST_FG');
+        xmlwriter_text($xw, sprintf("%.3f",floatval($row['est_fg'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_abv']) > 0) {
+        xmlwriter_start_element($xw, 'EST_ABV');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_abv'])));
+        xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_color']) > 0) {
+        xmlwriter_start_element($xw, 'EST_COLOR');
+        xmlwriter_text($xw, sprintf("%.6f", ebc_to_srm(floatval($row['est_color']))));
+        xmlwriter_end_element($xw);
+	xmlwriter_start_element($xw, 'COLOR_METHOD');
+	xmlwriter_text($xw, $colormethod[$row['color_method']]);
+	xmlwriter_end_element($xw);
+}
+
+if (floatval($row['est_ibu']) > 0) {
+        xmlwriter_start_element($xw, 'EST_IBU');
+        xmlwriter_text($xw, sprintf("%.1f",floatval($row['est_ibu'])));
+        xmlwriter_end_element($xw);
+	xmlwriter_start_element($xw, 'IBU_METHOD');
+	xmlwriter_text($xw, $ibumethod[$row['ibu_method']]);
+	xmlwriter_end_element($xw);
+}
+
 
 // Style
 xmlwriter_start_element($xw, 'STYLE');
@@ -128,10 +164,10 @@
 xmlwriter_end_element($xw);
 
 xmlwriter_start_element($xw, 'FG_MIN');
-xmlwriter_text($xw, sprintf("%.3f",floatval($row['st_og_min'])));
+xmlwriter_text($xw, sprintf("%.3f",floatval($row['st_fg_min'])));
 xmlwriter_end_element($xw);
 
-xmlwriter_start_element($xw, 'OG_MAX');
+xmlwriter_start_element($xw, 'FG_MAX');
 xmlwriter_text($xw, sprintf("%.3f",floatval($row['st_fg_max'])));
 xmlwriter_end_element($xw);
 
@@ -253,6 +289,7 @@
 xmlwriter_start_element($xw, 'FERMENTABLES');
 $arr = json_decode($row['json_fermentables'], true);
 foreach($arr as $item) { //foreach element in $arr
+    if ($item['f_added'] <= 3) {
 	xmlwriter_start_element($xw, 'FERMENTABLE');
 
 	xmlwriter_start_element($xw, 'VERSION');
@@ -330,6 +367,7 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_end_element($xw);	// FERMENTABLE
+    }
 }
 xmlwriter_end_element($xw);	// FERMENTABLES
 
@@ -451,6 +489,10 @@
 xmlwriter_text($xw, sprintf("%.2f",floatval($row['w1_calcium'])));
 xmlwriter_end_element($xw);
 
+xmlwriter_start_element($xw, 'MAGNESIUM');
+xmlwriter_text($xw, sprintf("%.2f",floatval($row['w1_magnesium'])));
+xmlwriter_end_element($xw);
+
 xmlwriter_start_element($xw, 'BICARBONATE');
 xmlwriter_text($xw, sprintf("%.2f",floatval($row['w1_total_alkalinity']) * 1.22));
 xmlwriter_end_element($xw);
@@ -496,6 +538,10 @@
 	xmlwriter_text($xw, sprintf("%.2f",floatval($row['w2_calcium'])));
 	xmlwriter_end_element($xw);
 
+	xmlwriter_start_element($xw, 'MAGNESIUM');
+	xmlwriter_text($xw, sprintf("%.2f",floatval($row['w2_magnesium'])));
+	xmlwriter_end_element($xw);
+
 	xmlwriter_start_element($xw, 'BICARBONATE');
 	xmlwriter_text($xw, sprintf("%.2f",floatval($row['w2_total_alkalinity']) * 1.22));
 	xmlwriter_end_element($xw);