diff -r 8edca0488e65 -r 9881453a49b3 www/rec_export.php
--- a/www/rec_export.php	Fri Feb 01 22:00:49 2019 +0100
+++ b/www/rec_export.php	Sat Feb 02 11:53:39 2019 +0100
@@ -23,6 +23,20 @@
 $row = mysqli_fetch_array($result);
 
 
+$recipetype = array( 'Extract', 'Partial Mash', 'All Grain' );
+$styletype = array( 'Lager', 'Ale', 'Mead', 'Wheat', 'Mixed', 'Cider' );
+$hoptype = array( 'Bittering', 'Aroma', 'Both' );
+$hopform = array( 'Pellet', 'Plug', 'Leaf' );
+$hopuse = array( 'Mash', 'First wort', 'Boil', 'Aroma', 'Whirlpool', 'Dry hop' );
+$fermentabletype = array( 'Grain', 'Sugar', 'Extract', 'Dry extract', 'Adjunct' );
+$graintype = array( 'Base', 'Roast', 'Crystal', 'Kilned', 'Sour malt', 'Special', 'No malt' );
+$yeasttype = array( 'Lager', 'Ale', 'Wheat', 'Wine', 'Champagne' );
+$yeastform = array( 'Liquid', 'Dry', 'Slant', 'Culture', 'Frozen', 'Bottle' );
+$yeastuse = array( 'Primary', 'Secondary', 'Tertiary', 'Bottle' );
+$misctype = array( 'Spice', 'Herb', 'Flavor', 'Fining', 'Water agent', 'Yeast nutrient', 'Other' );
+$miscuse = array( 'Starter', 'Mash', 'Boil', 'Primary', 'Secondary', 'Bottling' );
+$mashsteptype = array( 'Infusion', 'Temperature', 'Decoction' );
+
 
 /*
  * Create beerxml output
@@ -50,7 +64,7 @@
 xmlwriter_end_element($xw);
 
 xmlwriter_start_element($xw, 'TYPE');
-xmlwriter_text($xw, $row['type']);
+xmlwriter_text($xw, $recipetype[$row['type']]);
 xmlwriter_end_element($xw);
 
 xmlwriter_start_element($xw, 'BREWER');
@@ -73,6 +87,7 @@
 xmlwriter_text($xw, sprintf("%.1f",floatval($row['efficiency'])));
 xmlwriter_end_element($xw);
 
+
 // Style
 xmlwriter_start_element($xw, 'STYLE');
 
@@ -101,7 +116,7 @@
 xmlwriter_end_element($xw);
 
 xmlwriter_start_element($xw, 'TYPE');
-xmlwriter_text($xw, $row['st_type']);
+xmlwriter_text($xw, $styletype[$row['st_type']]);
 xmlwriter_end_element($xw);
 
 xmlwriter_start_element($xw, 'OG_MIN');
@@ -154,6 +169,7 @@
 
 xmlwriter_end_element($xw);	// STYLE
 
+
 xmlwriter_start_element($xw, 'EQUIPMENT');
 
 xmlwriter_start_element($xw, 'VERSION');
@@ -178,6 +194,7 @@
 
 xmlwriter_end_element($xw);	// EQUIPMENT
 
+
 xmlwriter_start_element($xw, 'HOPS');
 $arr = json_decode($row['json_hops'], true);
 foreach($arr as $item) { //foreach element in $arr
@@ -201,7 +218,7 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'USE');
-	xmlwriter_text($xw, $item['h_useat']);
+	xmlwriter_text($xw, $hopuse[$item['h_useat']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TIME');
@@ -209,11 +226,11 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TYPE');
-	xmlwriter_text($xw, $item['h_type']);
+	xmlwriter_text($xw, $hoptype[$item['h_type']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'FORM');
-	xmlwriter_text($xw, $item['h_form']);
+	xmlwriter_text($xw, $hopform[$item['h_form']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'BETA');
@@ -232,6 +249,7 @@
 }
 xmlwriter_end_element($xw);	// HOPS
 
+
 xmlwriter_start_element($xw, 'FERMENTABLES');
 $arr = json_decode($row['json_fermentables'], true);
 foreach($arr as $item) { //foreach element in $arr
@@ -246,7 +264,7 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TYPE');
-	xmlwriter_text($xw, $item['f_type']);
+	xmlwriter_text($xw, $fermentabletype[$item['f_type']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'AMOUNT');
@@ -308,13 +326,14 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'GRAINTYPE');
-	xmlwriter_text($xw, $item['f_graintype']);
+	xmlwriter_text($xw, $graintype[$item['f_graintype']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_end_element($xw);	// FERMENTABLE
 }
 xmlwriter_end_element($xw);	// FERMENTABLES
 
+
 xmlwriter_start_element($xw, 'MISCS');
 $arr = json_decode($row['json_miscs'], true);
 foreach($arr as $item) {
@@ -330,7 +349,7 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TYPE');
-	xmlwriter_text($xw, $item['m_type']);
+	xmlwriter_text($xw, $misctype[$item['m_type']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'AMOUNT');
@@ -342,7 +361,7 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'USE');
-	xmlwriter_text($xw, $item['m_use_use']);
+	xmlwriter_text($xw, $miscuse[$item['m_use_use']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TIME');
@@ -353,6 +372,7 @@
 }
 xmlwriter_end_element($xw);	// MISCS
 
+
 xmlwriter_start_element($xw, 'YEASTS');
 $arr = json_decode($row['json_yeasts'], true);
 foreach($arr as $item) { //foreach element in $arr
@@ -368,11 +388,11 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TYPE');
-	xmlwriter_text($xw, $item['y_type']);
+	xmlwriter_text($xw, $yeasttype[$item['y_type']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'FORM');
-	xmlwriter_text($xw, $item['y_form']);
+	xmlwriter_text($xw, $yeastform[$item['y_form']]);
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'AMOUNT');
@@ -380,7 +400,7 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'AMOUNT_IS_WEIGHT');
-	($item['y_amount_is_weight']) ? xmlwriter_text($xw, 'TRUE') : xmlwriter_text($xw, 'FALSE');
+	($item['y_form'] == 1) ? xmlwriter_text($xw, 'TRUE') : xmlwriter_text($xw, 'FALSE');
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'LABORATORY');
@@ -404,13 +424,14 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'ADD_TO_SECONDARY');
-	($item['y_use'] == 'Secondary') ? xmlwriter_text($xw, 'TRUE') : xmlwriter_text($xw, 'FALSE');
+	($item['y_use'] == 0) ? xmlwriter_text($xw, 'FALSE') : xmlwriter_text($xw, 'TRUE');
 	xmlwriter_end_element($xw);
 
 	xmlwriter_end_element($xw);	// YEAST
 }
 xmlwriter_end_element($xw);	// YEASTS
 
+
 xmlwriter_start_element($xw, 'WATERS');
 xmlwriter_start_element($xw, 'WATER');	// Source 1
 
@@ -503,6 +524,7 @@
 }
 xmlwriter_end_element($xw);	// WATERS
 
+
 xmlwriter_start_element($xw, 'MASH');
 
 xmlwriter_start_element($xw, 'VERSION');
@@ -539,10 +561,10 @@
 	xmlwriter_end_element($xw);
 
 	xmlwriter_start_element($xw, 'TYPE');
-	xmlwriter_text($xw, $item['step_type']);
+	xmlwriter_text($xw, $mashsteptype[$item['step_type']]);
 	xmlwriter_end_element($xw);
 
-	if ($item['step_type'] == 'Infusion') {
+	if ($item['step_type'] == 0) {
 		xmlwriter_start_element($xw, 'INFUSE_AMOUNT');
 		xmlwriter_text($xw, sprintf("%.1f",floatval($item['step_infuse_amount'])));
 		xmlwriter_end_element($xw);
@@ -572,6 +594,7 @@
 }
 xmlwriter_end_element($xw);	// MASH_STEPS
 xmlwriter_end_element($xw);	// MASH
+
 xmlwriter_end_element($xw);	// RECIPE
 xmlwriter_end_element($xw);	// RECIPES
 xmlwriter_end_document($xw);