X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=parse-xml.c;h=d17f7a8eed4d77ed0f8e862bb73b754dff0a4726;hb=a9f74044ae228f912515bebc983f872aa7f37695;hp=14c21972cdce96bc050606e2f65a9d0d8b49554a;hpb=61d0aa10e1a88ac2e5ddcab9e0f05a729b3ab9e9;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 14c2197..d17f7a8 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -488,6 +488,16 @@ static int uemis_fill_sample(struct sample *sample, const char *name, int len, c
  * Divinglog is crazy. The temperatures are in celsius. EXCEPT
  * for the sample temperatures, that are in Fahrenheit.
  * WTF?
+ *
+ * Oh, and I think Diving Log *internally* probably kept them
+ * in celsius, because I'm seeing entries like
+ *
+ *	<Temp>32.0</Temp>
+ *
+ * in there. Which is freezing, aka 0 degC. I bet the "0" is
+ * what Diving Log uses for "no temperature".
+ *
+ * So throw away crap like that.
  */
 static void fahrenheit(char *buffer, void *_temperature)
 {
@@ -496,6 +506,9 @@ static void fahrenheit(char *buffer, void *_temperature)
 
 	switch (integer_or_float(buffer, &val)) {
 	case FLOAT:
+		/* Floating point equality is evil, but works for small integers */
+		if (val.fp == 32.0)
+			break;
 		temperature->mkelvin = (val.fp + 459.67) * 5000/9;
 		break;
 	default:
@@ -639,7 +652,6 @@ static int divinglog_dive_match(struct dive *dive, const char *name, int len, ch
 		MATCH(".depth", depth, &dive->maxdepth) ||
 		MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
 		MATCH(".presw", pressure, &dive->cylinder[0].type.workingpressure) ||
-		MATCH(".tanktype", utf8_string, &dive->cylinder[0].type.description) ||
 		MATCH(".comments", utf8_string, &dive->notes) ||
 		MATCH(".country.name", utf8_string, &country) ||
 		MATCH(".city.name", utf8_string, &city) ||
@@ -986,7 +998,7 @@ static void dive_start(void)
 	memset(&tm, 0, sizeof(tm));
 }
 
-static void sanitize_gasmix(gasmix_t *mix)
+static void sanitize_gasmix(struct gasmix *mix)
 {
 	unsigned int o2, he;
 
@@ -1017,7 +1029,8 @@ static void sanitize_gasmix(gasmix_t *mix)
  */
 static void match_standard_cylinder(cylinder_type_t *type)
 {
-	int psi, cuft, len;
+	double cuft;
+	int psi, len;
 	const char *fmt;
 	char buffer[20], *p;
 
@@ -1025,7 +1038,8 @@ static void match_standard_cylinder(cylinder_type_t *type)
 	if (type->description)
 		return;
 
-	cuft = type->size.mliter / 1000;
+	cuft = type->size.mliter / 28317.0;
+	cuft *= type->workingpressure.mbar / 1013.25;
 	psi = type->workingpressure.mbar / 68.95;
 
 	switch (psi) {
@@ -1033,7 +1047,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
 		fmt = "LP%d";
 		break;
 	case 2600 ... 2700:	/* 2640 psi: LP+10% */
-		fmt = "LP%d+";
+		fmt = "LP%d";
 		break;
 	case 2900 ... 3100:	/* 3000 psi: ALx tank */
 		fmt = "AL%d";
@@ -1047,7 +1061,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
 	default:
 		return;
 	}
-	len = snprintf(buffer, sizeof(buffer), fmt, cuft);
+	len = snprintf(buffer, sizeof(buffer), fmt, (int) (cuft+0.5));
 	p = malloc(len+1);
 	if (!p)
 		return;
@@ -1078,15 +1092,15 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
 	if (!type->size.mliter)
 		return;
 
-	/* Ok, we have both size and pressure: try to match a description */
-	match_standard_cylinder(type);
-
 	if (input_units.volume == CUFT || import_source == SUUNTO) {
 		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;
 	}
+
+	/* Ok, we have both size and pressure: try to match a description */
+	match_standard_cylinder(type);
 }
 
 static void sanitize_cylinder_info(struct dive *dive)