X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=26e322f80827dbfdc08678593880ef4f3f46a6fb;hb=11becb87505b8cdf6fbf2f10941f87d394e49f80;hp=dfe6a616e6e9042152fccc59ac61fcad35dab141;hpb=2cd2cafdf4fc1ea37872f172a62d3d38220adf64;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index dfe6a61..26e322f 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -29,7 +29,7 @@ static void record_dive(struct dive *dive)
 		dive_table.dives = dives;
 		dive_table.allocated = allocated;
 	}
-	dives[nr] = dive;
+	dives[nr] = fixup_dive(dive);
 	dive_table.nr = nr+1;
 }
 
@@ -62,6 +62,28 @@ static int match(const char *pattern, int plen,
 	return 1;
 }
 
+/*
+ * We keep our internal data in well-specified units, but
+ * the input may come in some random format. This keeps track
+ * of the incoming units.
+ */
+static struct units {
+	enum { METERS, FEET } length;
+	enum { LITER, CUFT } volume;
+	enum { BAR, PSI } pressure;
+	enum { CELSIUS, FAHRENHEIT } temperature;
+	enum { KG, LBS } weight;
+} units;
+
+/* We're going to default to SI units for input */
+static const struct units SI_units = {
+	.length = METERS,
+	.volume = LITER,
+	.pressure = BAR,
+	.temperature = CELSIUS,
+	.weight = KG
+};
+
 /*
  * Dive info as it is being built up..
  */
@@ -69,8 +91,8 @@ static int alloc_samples;
 static struct dive *dive;
 static struct sample *sample;
 static struct tm tm;
-static int suunto;
-static int event_index, gasmix_index;
+static int suunto, uemis;
+static int event_index, cylinder_index;
 
 static time_t utc_mktime(struct tm *tm)
 {
@@ -164,13 +186,11 @@ static void divedatetime(char *buffer, void *_when)
 }
 
 union int_or_float {
-	long i;
 	double fp;
 };
 
 enum number_type {
 	NEITHER,
-	INTEGER,
 	FLOAT
 };
 
@@ -195,38 +215,37 @@ static enum number_type integer_or_float(char *buffer, union int_or_float *res)
 		}
 	}
 
-	res->i = val;
-	return INTEGER;
+	res->fp = val;
+	return FLOAT;
 }
 
 static void pressure(char *buffer, void *_press)
 {
+	double mbar;
 	pressure_t *pressure = _press;
 	union int_or_float val;
 
 	switch (integer_or_float(buffer, &val)) {
 	case FLOAT:
-		/* Maybe it's in Bar? */
-		if (val.fp < 500.0) {
-			pressure->mbar = val.fp * 1000 + 0.5;
+		/* Just ignore zero values */
+		if (!val.fp)
+			break;
+		switch (units.pressure) {
+		case BAR:
+			/* Assume mbar, but if it's really small, it's bar */
+			mbar = val.fp;
+			if (mbar < 5000)
+				mbar = mbar * 1000;
+			break;
+		case PSI:
+			mbar = val.fp * 68.95;
 			break;
 		}
-		printf("Unknown fractional pressure reading %s\n", buffer);
-		break;
-
-	case INTEGER:
-		/*
-		 * Random integer? Maybe in PSI? Or millibar already?
-		 *
-		 * We assume that 5 bar is a ridiculous tank pressure,
-		 * so if it's smaller than 5000, it's in PSI..
-		 */
-		if (val.i < 5000) {
-			pressure->mbar = val.i * 68.95;
+		if (mbar > 5 && mbar < 500000) {
+			pressure->mbar = mbar + 0.5;
 			break;
 		}
-		pressure->mbar = val.i;
-		break;
+	/* fallthrough */
 	default:
 		printf("Strange pressure reading %s\n", buffer);
 	}
@@ -239,12 +258,15 @@ static void depth(char *buffer, void *_depth)
 	union int_or_float val;
 
 	switch (integer_or_float(buffer, &val)) {
-	/* All values are probably in meters */
-	case INTEGER:
-		val.fp = val.i;
-		/* fallthrough */
 	case FLOAT:
-		depth->mm = val.fp * 1000 + 0.5;
+		switch (units.length) {
+		case METERS:
+			depth->mm = val.fp * 1000 + 0.5;
+			break;
+		case FEET:
+			depth->mm = val.fp * 304.8 + 0.5;
+			break;
+		}
 		break;
 	default:
 		printf("Strange depth reading %s\n", buffer);
@@ -258,28 +280,19 @@ static void temperature(char *buffer, void *_temperature)
 	union int_or_float val;
 
 	switch (integer_or_float(buffer, &val)) {
-	/* C or F? Who knows? Let's default to Celsius */
-	case INTEGER:
-		val.fp = val.i;
-		/* Fallthrough */
 	case FLOAT:
 		/* Ignore zero. It means "none" */
 		if (!val.fp)
 			break;
 		/* Celsius */
-		if (val.fp < 50.0) {
+		switch (units.temperature) {
+		case CELSIUS:
 			temperature->mkelvin = (val.fp + 273.15) * 1000 + 0.5;
 			break;
-		}
-		/* Fahrenheit */
-		if (val.fp < 212.0) {
+		case FAHRENHEIT:
 			temperature->mkelvin = (val.fp + 459.67) * 5000/9;
 			break;
 		}
-		/* Kelvin or already millikelvin */
-		if (val.fp < 1000.0)
-			val.fp *= 1000;
-		temperature->mkelvin = val.fp;
 		break;
 	default:
 		printf("Strange temperature reading %s\n", buffer);
@@ -319,10 +332,6 @@ static void percent(char *buffer, void *_fraction)
 	union int_or_float val;
 
 	switch (integer_or_float(buffer, &val)) {
-	/* C or F? Who knows? Let's default to Celsius */
-	case INTEGER:
-		val.fp = val.i;
-		/* Fallthrough */
 	case FLOAT:
 		if (val.fp <= 100.0)
 			fraction->permille = val.fp * 10 + 0.5;
@@ -340,7 +349,7 @@ static void gasmix(char *buffer, void *_fraction)
 	/* libdivecomputer does negative percentages. */
 	if (*buffer == '-')
 		return;
-	if (gasmix_index < MAX_MIXES)
+	if (cylinder_index < MAX_CYLINDERS)
 		percent(buffer, _fraction);
 }
 
@@ -349,23 +358,124 @@ static void gasmix_nitrogen(char *buffer, void *_gasmix)
 	/* Ignore n2 percentages. There's no value in them. */
 }
 
+static void cylindersize(char *buffer, void *_volume)
+{
+	volume_t *volume = _volume;
+	union int_or_float val;
+
+	switch (integer_or_float(buffer, &val)) {
+	case FLOAT:
+		volume->mliter = val.fp * 1000 + 0.5;
+		break;
+
+	default:
+		printf("Strange volume reading %s\n", buffer);
+		break;
+	}
+	free(buffer);
+}
+
 static void utf8_string(char *buffer, void *_res)
 {
 	*(char **)_res = buffer;
 }
 
+/*
+ * Uemis water_pressure. In centibar. And when converting to
+ * depth, I'm just going to always use saltwater, because I
+ * think "true depth" is just stupid. From a diving standpoint,
+ * "true depth" is pretty much completely pointless, unless
+ * you're doing some kind of underwater surveying work.
+ *
+ * So I give water depths in "pressure depth", always assuming
+ * salt water. So one atmosphere per 10m.
+ */
+static void water_pressure(char *buffer, void *_depth)
+{
+	depth_t *depth = _depth;
+        union int_or_float val;
+	double atm, cm;
+
+        switch (integer_or_float(buffer, &val)) {
+        case FLOAT:
+		if (!val.fp)
+			break;
+		/* cbar to atm */
+		atm = (val.fp / 100) / 1.01325;
+		/*
+		 * atm to cm. Why not mm? The precision just isn't
+		 * there.
+		 */
+		cm = 100 * (atm - 1) + 0.5;
+		if (cm > 0) {
+			depth->mm = 10 * (long)cm;
+			break;
+		}
+	default:
+		fprintf(stderr, "Strange water pressure '%s'\n", buffer);
+	}
+	free(buffer);
+}
+
 #define MATCH(pattern, fn, dest) \
 	match(pattern, strlen(pattern), name, len, fn, buf, dest)
 
+static void get_index(char *buffer, void *_i)
+{
+	int *i = _i;
+	*i = atoi(buffer);
+	free(buffer);
+}
+
+static void centibar(char *buffer, void *_pressure)
+{
+	pressure_t *pressure = _pressure;
+	union int_or_float val;
+
+	switch (integer_or_float(buffer, &val)) {
+	case FLOAT:
+		pressure->mbar = val.fp * 10 + 0.5;
+		break;
+	default:
+		fprintf(stderr, "Strange centibar pressure '%s'\n", buffer);
+	}
+	free(buffer);
+}
+
+static void decicelsius(char *buffer, void *_temp)
+{
+	temperature_t *temp = _temp;
+        union int_or_float val;
+
+        switch (integer_or_float(buffer, &val)) {
+        case FLOAT:
+		temp->mkelvin = (val.fp/10 + 273.15) * 1000 + 0.5;
+		break;
+	default:
+		fprintf(stderr, "Strange julian date: %s", buffer);
+	}
+	free(buffer);
+}
+
+static int uemis_fill_sample(struct sample *sample, const char *name, int len, char *buf)
+{
+	return	MATCH(".reading.dive_time", sampletime, &sample->time) ||
+		MATCH(".reading.water_pressure", water_pressure, &sample->depth) ||
+		MATCH(".reading.active_tank", get_index, &sample->cylinderindex) ||
+		MATCH(".reading.tank_pressure", centibar, &sample->cylinderpressure) ||
+		MATCH(".reading.dive_temperature", decicelsius, &sample->temperature) ||
+		0;
+}
+
 /* We're in samples - try to convert the random xml value to something useful */
 static void try_to_fill_sample(struct sample *sample, const char *name, char *buf)
 {
 	int len = strlen(name);
 
 	start_match("sample", name, buf);
-	if (MATCH(".sample.pressure", pressure, &sample->tankpressure))
+	if (MATCH(".sample.pressure", pressure, &sample->cylinderpressure))
 		return;
-	if (MATCH(".sample.cylpress", pressure, &sample->tankpressure))
+	if (MATCH(".sample.cylpress", pressure, &sample->cylinderpressure))
 		return;
 	if (MATCH(".sample.depth", depth, &sample->depth))
 		return;
@@ -378,6 +488,11 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
 	if (MATCH(".sample.time", sampletime, &sample->time))
 		return;
 
+	if (uemis) {
+		if (uemis_fill_sample(sample, name, len, buf))
+			return;
+	}
+
 	nonmatch("sample", name, buf);
 }
 
@@ -386,14 +501,184 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
  */
 static int suunto_dive_match(struct dive *dive, const char *name, int len, char *buf)
 {
-	return	MATCH(".o2pct", percent, &dive->gasmix[0].o2) ||
-		MATCH(".hepct_0", percent, &dive->gasmix[0].he) ||
-		MATCH(".o2pct_2", percent, &dive->gasmix[1].o2) ||
-		MATCH(".hepct_1", percent, &dive->gasmix[1].he) ||
-		MATCH(".o2pct_3", percent, &dive->gasmix[2].o2) ||
-		MATCH(".hepct_2", percent, &dive->gasmix[2].he) ||
-		MATCH(".o2pct_4", percent, &dive->gasmix[3].o2) ||
-		MATCH(".hepct_3", percent, &dive->gasmix[3].he);
+	return	MATCH(".o2pct", percent, &dive->cylinder[0].gasmix.o2) ||
+		MATCH(".hepct_0", percent, &dive->cylinder[0].gasmix.he) ||
+		MATCH(".o2pct_2", percent, &dive->cylinder[1].gasmix.o2) ||
+		MATCH(".hepct_1", percent, &dive->cylinder[1].gasmix.he) ||
+		MATCH(".o2pct_3", percent, &dive->cylinder[2].gasmix.o2) ||
+		MATCH(".hepct_2", percent, &dive->cylinder[2].gasmix.he) ||
+		MATCH(".o2pct_4", percent, &dive->cylinder[3].gasmix.o2) ||
+		MATCH(".hepct_3", percent, &dive->cylinder[3].gasmix.he) ||
+		MATCH(".cylindersize", cylindersize, &dive->cylinder[0].type.size) ||
+		MATCH(".cylinderworkpressure", pressure, &dive->cylinder[0].type.workingpressure) ||
+		0;
+}
+
+static int buffer_value(char *buffer)
+{
+	int val = atoi(buffer);
+	free(buffer);
+	return val;
+}
+
+static void uemis_length_unit(char *buffer, void *_unused)
+{
+	units.length = buffer_value(buffer) ? FEET : METERS;
+}
+
+static void uemis_volume_unit(char *buffer, void *_unused)
+{
+	units.volume = buffer_value(buffer) ? CUFT : LITER;
+}
+
+static void uemis_pressure_unit(char *buffer, void *_unused)
+{
+#if 0
+	units.pressure = buffer_value(buffer) ? PSI : BAR;
+#endif
+}
+
+static void uemis_temperature_unit(char *buffer, void *_unused)
+{
+	units.temperature = buffer_value(buffer) ? FAHRENHEIT : CELSIUS;
+}
+
+static void uemis_weight_unit(char *buffer, void *_unused)
+{
+	units.weight = buffer_value(buffer) ? LBS : KG;
+}
+
+static void uemis_time_unit(char *buffer, void *_unused)
+{
+}
+
+static void uemis_date_unit(char *buffer, void *_unused)
+{
+}
+
+/* Modified julian day, yay! */
+static void uemis_date_time(char *buffer, void *_when)
+{
+	time_t *when = _when;
+        union int_or_float val;
+
+        switch (integer_or_float(buffer, &val)) {
+        case FLOAT:
+		*when = (val.fp - 40587.5) * 86400;
+		break;
+	default:
+		fprintf(stderr, "Strange julian date: %s", buffer);
+	}
+	free(buffer);
+}
+
+/*
+ * Uemis doesn't know time zones. You need to do them as
+ * minutes, not hours.
+ *
+ * But that's ok, we don't track timezones yet either. We
+ * just turn everything into "localtime expressed as UTC".
+ */
+static void uemis_time_zone(char *buffer, void *_when)
+{
+	time_t *when = _when;
+	signed char tz = atoi(buffer);
+
+	*when += tz * 3600;
+}
+
+/* 0 - air ; 1 - nitrox1 ; 2 - nitrox2 ; 3 = nitrox3 */
+static int uemis_gas_template;
+
+/*
+ * Christ. Uemis tank data is a total mess.
+ *
+ * We're passed a "virtual cylinder" (0 - 6) for the different
+ * Uemis tank cases ("air", "nitrox_1", "nitrox_2.{bottom,deco}"
+ * and "nitrox_3.{bottom,deco,travel}". We need to turn that
+ * into the actual cylinder data depending on the gas template,
+ * and ignore the ones that are irrelevant for that template.
+ *
+ * So for "template 2" (nitrox_2), we ignore virtual tanks 0-1
+ * (which are "air" and "nitrox_1" respectively), and tanks 4-6
+ * (which are the three "nitrox_3" tanks), and we turn virtual
+ * tanks 2/3 into actual tanks 0/1.
+ *
+ * Confused yet?
+ */
+static int uemis_cylinder_index(void *_cylinder)
+{
+	cylinder_t *cylinder = _cylinder;
+	unsigned int index = cylinder - dive->cylinder;
+
+	if (index > 6) {
+		fprintf(stderr, "Uemis cylinder pointer calculations broken\n");
+		return -1;
+	}
+	switch(uemis_gas_template) {
+	case 1:	/* Dive uses tank 1 */
+		index -= 1;
+	/* Fallthrough */
+	case 0:	/* Dive uses tank 0 */
+		if (index)
+			index = -1;
+		break;
+	case 2: /* Dive uses tanks 2-3 */
+		index -= 2;
+		if (index > 1)
+			index = -1;
+		break;
+	case 3: /* Dive uses tanks 4-6 */
+		index -= 4;
+		if (index > 2)
+			index = -1;
+		break;
+	}
+	return index;
+}
+
+static void uemis_cylindersize(char *buffer, void *_cylinder)
+{
+	int index = uemis_cylinder_index(_cylinder);
+	if (index >= 0)
+		cylindersize(buffer, &dive->cylinder[index].type.size);
+}
+
+static void uemis_percent(char *buffer, void *_cylinder)
+{
+	int index = uemis_cylinder_index(_cylinder);
+	if (index >= 0)
+		percent(buffer, &dive->cylinder[index].gasmix.o2);
+}
+
+static int uemis_dive_match(struct dive *dive, const char *name, int len, char *buf)
+{
+	return	MATCH(".units.length", uemis_length_unit, &units) ||
+		MATCH(".units.volume", uemis_volume_unit, &units) ||
+		MATCH(".units.pressure", uemis_pressure_unit, &units) ||
+		MATCH(".units.temperature", uemis_temperature_unit, &units) ||
+		MATCH(".units.weight", uemis_weight_unit, &units) ||
+		MATCH(".units.time", uemis_time_unit, &units) ||
+		MATCH(".units.date", uemis_date_unit, &units) ||
+		MATCH(".date_time", uemis_date_time, &dive->when) ||
+		MATCH(".time_zone", uemis_time_zone, &dive->when) ||
+		MATCH(".ambient.temperature", decicelsius, &dive->airtemp) ||
+		MATCH(".gas.template", get_index, &uemis_gas_template) ||
+		MATCH(".air.bottom_tank.size", uemis_cylindersize, dive->cylinder + 0) ||
+		MATCH(".air.bottom_tank.oxygen", uemis_percent, dive->cylinder + 0) ||
+		MATCH(".nitrox_1.bottom_tank.size", uemis_cylindersize, dive->cylinder + 1) ||
+		MATCH(".nitrox_1.bottom_tank.oxygen", uemis_percent, dive->cylinder + 1) ||
+		MATCH(".nitrox_2.bottom_tank.size", uemis_cylindersize, dive->cylinder + 2) ||
+		MATCH(".nitrox_2.bottom_tank.oxygen", uemis_percent, dive->cylinder + 2) ||
+		MATCH(".nitrox_2.deco_tank.size", uemis_cylindersize, dive->cylinder + 3) ||
+		MATCH(".nitrox_2.deco_tank.oxygen", uemis_percent, dive->cylinder + 3) ||
+		MATCH(".nitrox_3.bottom_tank.size", uemis_cylindersize, dive->cylinder + 4) ||
+		MATCH(".nitrox_3.bottom_tank.oxygen", uemis_percent, dive->cylinder + 4) ||
+		MATCH(".nitrox_3.deco_tank.size", uemis_cylindersize, dive->cylinder + 5) ||
+		MATCH(".nitrox_3.deco_tank.oxygen", uemis_percent, dive->cylinder + 5) ||
+		MATCH(".nitrox_3.travel_tank.size", uemis_cylindersize, dive->cylinder + 6) ||
+		MATCH(".nitrox_3.travel_tank.oxygen", uemis_percent, dive->cylinder + 6) ||
+		0;
 }
 
 /* We're in the top-level dive xml. Try to convert whatever value to a dive value */
@@ -412,6 +697,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 		return;
 	if (MATCH(".meandepth", depth, &dive->meandepth))
 		return;
+	if (MATCH(".depth.max", depth, &dive->maxdepth))
+		return;
+	if (MATCH(".depth.mean", depth, &dive->meandepth))
+		return;
 	if (MATCH(".duration", duration, &dive->duration))
 		return;
 	if (MATCH(".divetime", duration, &dive->duration))
@@ -424,32 +713,45 @@ 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(".temperature.air", temperature, &dive->airtemp))
+		return;
+	if (MATCH(".temperature.water", temperature, &dive->watertemp))
+		return;
+	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;
 	if (MATCH(".notes", utf8_string, &dive->notes))
 		return;
 
-	if (MATCH(".o2", gasmix, &dive->gasmix[gasmix_index].o2))
+	if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cylinder_index].type.size))
+		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;
-	if (MATCH(".n2", gasmix_nitrogen, &dive->gasmix[gasmix_index]))
+	if (MATCH(".n2", gasmix_nitrogen, &dive->cylinder[cylinder_index].gasmix))
 		return;
-	if (MATCH(".he", gasmix, &dive->gasmix[gasmix_index].he))
+	if (MATCH(".he", gasmix, &dive->cylinder[cylinder_index].gasmix.he))
 		return;
 
 	/* Suunto XML files are some crazy sh*t. */
 	if (suunto && suunto_dive_match(dive, name, len, buf))
 		return;
 
-	nonmatch("dive", name, buf);
-}
+	if (uemis && uemis_dive_match(dive, name, len, buf))
+		return;
 
-static unsigned int dive_size(int samples)
-{
-	return sizeof(struct dive) + samples*sizeof(struct sample);
+	nonmatch("dive", name, buf);
 }
 
 /*
@@ -474,55 +776,115 @@ static void dive_start(void)
 	memset(&tm, 0, sizeof(tm));
 }
 
-static char *generate_name(struct dive *dive)
+static void sanitize_gasmix(gasmix_t *mix)
 {
-	int len;
-	struct tm *tm;
-	char buffer[256], *p;
-
-	tm = gmtime(&dive->when);
-
-	len = snprintf(buffer, sizeof(buffer),
-		"%04d-%02d-%02d "
-		"%02d:%02d:%02d "
-		"(%d ft, %d min)",
-		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec,
-		to_feet(dive->maxdepth), dive->duration.seconds / 60);
+	unsigned int o2, he;
+
+	o2 = mix->o2.permille;
+	he = mix->he.permille;
+
+	/* Regular air: leave empty */
+	if (!he) {
+		if (!o2)
+			return;
+		/* 20.9% or 21% O2 is just air */
+		if (o2 >= 209 && o2 <= 210) {
+			mix->o2.permille = 0;
+			return;
+		}
+	}
+
+	/* Sane mix? */
+	if (o2 <= 1000 && he <= 1000 && o2+he <= 1000)
+		return;
+	fprintf(stderr, "Odd gasmix: %d O2 %d He\n", o2, he);
+	memset(mix, 0, sizeof(*mix));
+}
+
+/*
+ * See if the size/workingpressure looks like some standard cylinder
+ * size, eg "AL80".
+ */
+static void match_standard_cylinder(cylinder_type_t *type)
+{
+	int psi, cuft, len;
+	const char *fmt;
+	char buffer[20], *p;
+
+	/* Do we already have a cylinder description? */
+	if (type->description)
+		return;
+
+	cuft = type->size.mliter / 1000;
+	psi = type->workingpressure.mbar / 68.95;
+
+	switch (psi) {
+	case 2300 ... 2500:	/* 2400 psi: LP tank */
+		fmt = "LP%d";
+		break;
+	case 2600 ... 2700:	/* 2640 psi: LP+10% */
+		fmt = "LP%d+";
+		break;
+	case 2900 ... 3100:	/* 3000 psi: ALx tank */
+		fmt = "AL%d";
+		break;
+	case 3400 ... 3500:	/* 3442 psi: HP tank */
+		fmt = "HP%d";
+		break;
+	case 3700 ... 3850:	/* HP+10% */
+		fmt = "HP%d+";
+		break;
+	default:
+		return;
+	}
+	len = snprintf(buffer, sizeof(buffer), fmt, cuft);
 	p = malloc(len+1);
 	if (!p)
-		exit(1);
+		return;
 	memcpy(p, buffer, len+1);
-	return p;
+	type->description = p;
+}
+
+
+/*
+ * There are two ways to give cylinder size information:
+ *  - total amount of gas in cuft (depends on working pressure and physical size)
+ *  - physical size
+ *
+ * where "physical size" is the one that actually matters and is sane.
+ *
+ * We internally use physical size only. But we save the workingpressure
+ * so that we can do the conversion if required.
+ */
+static void sanitize_cylinder_type(cylinder_type_t *type)
+{
+	double volume_of_air, atm, volume;
+
+	/* If we have no working pressure, it had *better* be just a physical size! */
+	if (!type->workingpressure.mbar)
+		return;
+
+	/* No size either? Nothing to go on */
+	if (!type->size.mliter)
+		return;
+
+	/* Ok, we have both size and pressure: try to match a description */
+	match_standard_cylinder(type);
+
+	/* .. and let's assume that the 'size' was cu ft of air */
+	volume_of_air = type->size.mliter * 28.317;	/* milli-cu ft to milliliter */
+	atm = type->workingpressure.mbar / 1013.25;	/* working pressure in atm */
+	volume = volume_of_air / atm;			/* milliliters at 1 atm: "true size" */
+	type->size.mliter = volume + 0.5;
 }
 
-static void sanitize_gasmix(struct dive *dive)
+static void sanitize_cylinder_info(struct dive *dive)
 {
 	int i;
 
-	for (i = 0; i < MAX_MIXES; i++) {
-		gasmix_t *mix = dive->gasmix+i;
-		unsigned int o2, he;
-
-		o2 = mix->o2.permille;
-		he = mix->he.permille;
-
-		/* Regular air: leave empty */
-		if (!he) {
-			if (!o2)
-				continue;
-			/* 20.9% or 21% O2 is just air */
-			if (o2 >= 209 && o2 <= 210) {
-				mix->o2.permille = 0;
-				continue;
-			}
-		}
-
-		/* Sane mix? */
-		if (o2 <= 1000 && he <= 1000 && o2+he <= 1000)
-			continue;
-		fprintf(stderr, "Odd gasmix: %d O2 %d He\n", o2, he);
-		memset(mix, 0, sizeof(*mix));
+	for (i = 0; i < MAX_CYLINDERS; i++) {
+		sanitize_gasmix(&dive->cylinder[i].gasmix);
+		sanitize_cylinder_type(&dive->cylinder[i].type);
 	}
 }
 
@@ -530,17 +892,16 @@ static void dive_end(void)
 {
 	if (!dive)
 		return;
-	if (!dive->name)
-		dive->name = generate_name(dive);
-	sanitize_gasmix(dive);
+	sanitize_cylinder_info(dive);
 	record_dive(dive);
 	dive = NULL;
-	gasmix_index = 0;
+	cylinder_index = 0;
 }
 
 static void suunto_start(void)
 {
 	suunto++;
+	units = SI_units;
 }
 
 static void suunto_end(void)
@@ -548,6 +909,16 @@ static void suunto_end(void)
 	suunto--;
 }
 
+static void uemis_start(void)
+{
+	uemis++;
+	units = SI_units;
+}
+
+static void uemis_end(void)
+{
+}
+
 static void event_start(void)
 {
 }
@@ -557,13 +928,13 @@ static void event_end(void)
 	event_index++;
 }
 
-static void gasmix_start(void)
+static void cylinder_start(void)
 {
 }
 
-static void gasmix_end(void)
+static void cylinder_end(void)
 {
-	gasmix_index++;
+	cylinder_index++;
 }
 
 static void sample_start(void)
@@ -592,19 +963,6 @@ static void sample_end(void)
 	if (!dive)
 		return;
 
-	if (sample->time.seconds > dive->duration.seconds) {
-		if (sample->depth.mm)
-			dive->duration = sample->time;
-	}
-
-	if (sample->depth.mm > dive->maxdepth.mm)
-		dive->maxdepth.mm = sample->depth.mm;
-
-	if (sample->temperature.mkelvin) {
-		if (!dive->watertemp.mkelvin || dive->watertemp.mkelvin > sample->temperature.mkelvin)
-			dive->watertemp = sample->temperature;
-	}
-
 	sample = NULL;
 	dive->samples++;
 }
@@ -717,8 +1075,11 @@ static struct nesting {
 	{ "SUUNTO", suunto_start, suunto_end },
 	{ "sample", sample_start, sample_end },
 	{ "SAMPLE", sample_start, sample_end },
+	{ "reading", sample_start, sample_end },
 	{ "event", event_start, event_end },
-	{ "gasmix", gasmix_start, gasmix_end },
+	{ "gasmix", cylinder_start, cylinder_end },
+	{ "cylinder", cylinder_start, cylinder_end },
+	{ "pre_dive", uemis_start, uemis_end },
 	{ NULL, }
 };
 
@@ -743,16 +1104,39 @@ static void traverse(xmlNode *root)
 	}
 }
 
-void parse_xml_file(const char *filename)
+/* Per-file reset */
+static void reset_all(void)
+{
+	/*
+	 * We reset the units for each file. You'd think it was
+	 * a per-dive property, but I'm not going to trust people
+	 * to do per-dive setup. If the xml does have per-dive
+	 * data within one file, we might have to reset it per
+	 * dive for that format.
+	 */
+	units = SI_units;
+	suunto = 0;
+	uemis = 0;
+}
+
+void parse_xml_file(const char *filename, GError **error)
 {
 	xmlDoc *doc;
 
 	doc = xmlReadFile(filename, NULL, 0);
 	if (!doc) {
 		fprintf(stderr, "Failed to parse '%s'.\n", filename);
+		if (error != NULL)
+		{
+			*error = g_error_new(g_quark_from_string("divelog"),
+			                     DIVE_ERROR_PARSE,
+			                     "Failed to parse '%s'",
+			                     filename);
+		}
 		return;
 	}
 
+	reset_all();
 	dive_start();
 	traverse(xmlDocGetRootElement(doc));
 	dive_end();