X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=f68aae67e32f4f5417c1d27a8414b66bb610a5f8;hb=5f79a804b925a8ffbcf933bb6fae4f764b518c8e;hp=1ca046db7a62f2e0391e8f89e896df0c34dd06d8;hpb=f8de487c2f590d6f4e27f878ac104c229667702c;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 1ca046d..f68aae6 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -587,6 +587,7 @@ static void uemis_time_zone(char *buffer, void *_when)
 	*when += tz * 3600;
 }
 
+/* Christ. Uemis tank data is a total mess. */
 static int uemis_dive_match(struct dive *dive, const char *name, int len, char *buf)
 {
 	return	MATCH(".units.length", uemis_length_unit, &units) ||
@@ -599,6 +600,20 @@ static int uemis_dive_match(struct dive *dive, const char *name, int len, char *
 		MATCH(".date_time", uemis_date_time, &dive->when) ||
 		MATCH(".time_zone", uemis_time_zone, &dive->when) ||
 		MATCH(".ambient.temperature", decicelsius, &dive->airtemp) ||
+		MATCH(".air.bottom_tank.size", cylindersize, &dive->cylinder[0].type.size) ||
+		MATCH(".air.bottom_tank.oxygen", percent, &dive->cylinder[0].gasmix.o2) ||
+		MATCH(".nitrox_1.bottom_tank.size", cylindersize, &dive->cylinder[1].type.size) ||
+		MATCH(".nitrox_1.bottom_tank.oxygen", percent, &dive->cylinder[1].gasmix.o2) ||
+		MATCH(".nitrox_2.bottom_tank.size", cylindersize, &dive->cylinder[2].type.size) ||
+		MATCH(".nitrox_2.bottom_tank.oxygen", percent, &dive->cylinder[2].gasmix.o2) ||
+		MATCH(".nitrox_2.deco_tank.size", cylindersize, &dive->cylinder[3].type.size) ||
+		MATCH(".nitrox_2.deco_tank.oxygen", percent, &dive->cylinder[3].gasmix.o2) ||
+		MATCH(".nitrox_3.bottom_tank.size", cylindersize, &dive->cylinder[4].type.size) ||
+		MATCH(".nitrox_3.bottom_tank.oxygen", percent, &dive->cylinder[4].gasmix.o2) ||
+		MATCH(".nitrox_3.deco_tank.size", cylindersize, &dive->cylinder[5].type.size) ||
+		MATCH(".nitrox_3.deco_tank.oxygen", percent, &dive->cylinder[5].gasmix.o2) ||
+		MATCH(".nitrox_3.travel_tank.size", cylindersize, &dive->cylinder[6].type.size) ||
+		MATCH(".nitrox_3.travel_tank.oxygen", percent, &dive->cylinder[6].gasmix.o2) ||
 		0;
 }
 
@@ -630,9 +645,9 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 		return;
 	if (MATCH(".watertemp", temperature, &dive->watertemp))
 		return;
-	if (MATCH(".cylinderstartpressure", pressure, &dive->beginning_pressure))
+	if (MATCH(".cylinderstartpressure", pressure, &dive->cylinder[0].start))
 		return;
-	if (MATCH(".cylinderendpressure", pressure, &dive->end_pressure))
+	if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))
 		return;
 	if (MATCH(".location", utf8_string, &dive->location))
 		return;
@@ -643,6 +658,12 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 		return;
 	if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cylinder_index].type.workingpressure))
 		return;
+	if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cylinder_index].type.description))
+		return;
+	if (MATCH(".cylinder.start", pressure, &dive->cylinder[cylinder_index].start))
+		return;
+	if (MATCH(".cylinder.end", pressure, &dive->cylinder[cylinder_index].end))
+		return;
 
 	if (MATCH(".o2", gasmix, &dive->cylinder[cylinder_index].gasmix.o2))
 		return;