diff -r 0efba09a694c -r 0a8495edf53c www/export_yeasts.php
--- a/www/export_yeasts.php	Sun Feb 02 13:20:28 2020 +0100
+++ b/www/export_yeasts.php	Tue Feb 11 21:16:49 2020 +0100
@@ -15,6 +15,11 @@
 $result = mysqli_query($link, "SELECT * FROM inventory_yeasts ORDER BY laboratory,product_id,name");
 $row = mysqli_fetch_array($result);
 
+function field($x, $field, $value) {
+        xmlwriter_start_element($x, $field);
+        xmlwriter_text($x, $value);
+        xmlwriter_end_element($x);
+}
 
 $yeasttype = array( 'Lager', 'Ale', 'Wheat', 'Wine', 'Champagne', 'Other', 'Other', 'Other', 'Other', 'Other' );
 $yeastform = array( 'Liquid', 'Dry', 'Slant', 'Culture', 'Frozen', 'Bottle', 'Dry' );
@@ -36,76 +41,28 @@
 
 	xmlwriter_start_element($xw, 'YEAST');
 
-	xmlwriter_start_element($xw, 'VERSION');
-	xmlwriter_text($xw, '1');
-	xmlwriter_end_element($xw);
-
-	xmlwriter_start_element($xw, 'NAME');
-	xmlwriter_text($xw, $row['name']);
-	xmlwriter_end_element($xw);
-
-	xmlwriter_start_element($xw, 'TYPE');
-	xmlwriter_text($xw, $yeasttype[$row['type']]);
-	xmlwriter_end_element($xw);
-
-        xmlwriter_start_element($xw, 'FORM');
-        xmlwriter_text($xw, $yeastform[$row['form']]);
-        xmlwriter_end_element($xw);
-
-	xmlwriter_start_element($xw, 'AMOUNT_IS_WEIGHT');
-	($row['amount_is_weight']) ? xmlwriter_text($xw, 'TRUE') : xmlwriter_text($xw, 'FALSE');
-	xmlwriter_end_element($xw);
-
-        xmlwriter_start_element($xw, 'LABORATORY');
-        xmlwriter_text($xw, $row['laboratory']);
-        xmlwriter_end_element($xw);
-
-	if (strlen($row['product_id'])) {
-        	xmlwriter_start_element($xw, 'PRODUCT_ID');
-        	xmlwriter_text($xw, $row['product_id']);
-        	xmlwriter_end_element($xw);
-	}
-
-        xmlwriter_start_element($xw, 'MIN_TEMPERATURE');
-        xmlwriter_text($xw, sprintf("%.4f",floatval($row['min_temperature'])));
-        xmlwriter_end_element($xw);
+	field($xw, 'VERSION', '1');
+	field($xw, 'NAME', $row['name']);
+	field($xw, 'TYPE', $yeasttype[$row['type']]);
+	field($xw, 'FORM', $yeastform[$row['form']]);
+	field($xw, 'AMOUNT_IS_WEIGHT', ($row['form'] == '1' || $row['form'] == '6') ? 'TRUE':'FALSE');
+	field($xw, 'LABORATORY', $row['laboratory']);
+	if (strlen($row['product_id']))
+		field($xw, 'PRODUCT_ID', $row['product_id']);
+	field($xw, 'MIN_TEMPERATURE', sprintf("%.4f",floatval($row['min_temperature'])));
+	field($xw, 'MAX_TEMPERATURE', sprintf("%.4f",floatval($row['max_temperature'])));
+	field($xw, 'ATTENUATION', sprintf("%.4f",floatval($row['attenuation'])));
+	field($xw, 'ADD_TO_SECONDARY', ($row['use'] == 0) ? 'FALSE':'TRUE');
+	field($xw, 'FLOCCULATION', $yeastflocculation[$row['flocculation']]);
+	field($xw, 'MAX_REUSE', $row['max_reuse']);
+	if (floatval($row['cost']) > 0)
+		field($xw, 'COST', sprintf("%.5f",floatval($row['cost'])));
+	if (strlen($row['notes']))
+		field($xw, 'NOTES', $row['notes']);
 
-        xmlwriter_start_element($xw, 'MAX_TEMPERATURE');
-        xmlwriter_text($xw, sprintf("%.4f",floatval($row['max_temperature'])));
-        xmlwriter_end_element($xw);
-
-        xmlwriter_start_element($xw, 'ATTENUATION');
-        xmlwriter_text($xw, sprintf("%.4f",floatval($row['attenuation'])));
-        xmlwriter_end_element($xw);
-
-        xmlwriter_start_element($xw, 'ADD_TO_SECONDARY');
-        ($row['use'] == 0) ? xmlwriter_text($xw, 'FALSE') : xmlwriter_text($xw, 'TRUE');
-        xmlwriter_end_element($xw);
-
-        xmlwriter_start_element($xw, 'FLOCCULATION');
-        xmlwriter_text($xw, $yeastflocculation[$row['flocculation']]);
-        xmlwriter_end_element($xw);
-
-        xmlwriter_start_element($xw, 'MAX_REUSE');
-        xmlwriter_text($xw, $row['max_reuse']);
-        xmlwriter_end_element($xw);
-
-	if (floatval($row['cost']) > 0) {
-		xmlwriter_start_element($xw, 'COST');
-		xmlwriter_text($xw, sprintf("%.5f",floatval($row['cost'])));
-		xmlwriter_end_element($xw);
-	}
-
-	if (strlen($row['notes'])) {
-		xmlwriter_start_element($xw, 'NOTES');
-		xmlwriter_text($xw, $row['notes']);
-		xmlwriter_end_element($xw);
-	}
-
-
-	xmlwriter_end_element($xw);	// MISC
+	xmlwriter_end_element($xw);	// YEAST
 }
-xmlwriter_end_element($xw);	// MISCS
+xmlwriter_end_element($xw);	// YEASTS
 
 $beerxml = xmlwriter_output_memory($xw);