X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=ddee64e2d1bfd13e97e118863f922eda4fef42d6;hb=5f79a804b925a8ffbcf933bb6fae4f764b518c8e;hp=7609b1db87b2baf2870eea776c717a09f0fe7256;hpb=c66d60efa1efcb5dfbeff3bd345580c977c50f10;p=ext%2Fsubsurface.git

diff --git a/save-xml.c b/save-xml.c
index 7609b1d..ddee64e 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -11,12 +11,28 @@
 
 static void show_milli(FILE *f, const char *pre, int value, const char *unit, const char *post)
 {
+	int i;
+	char buf[4];
+	unsigned v;
+
 	fputs(pre, f);
+	v = value;
 	if (value < 0) {
 		putc('-', f);
-		value = -value;
+		v = -value;
+	}
+	for (i = 2; i >= 0; i--) {
+		buf[i] = (v % 10) + '0';
+		v /= 10;
 	}
-	fprintf(f, "%u.%03u%s%s", FRACTION(value, 1000), unit, post);
+	buf[3] = 0;
+	if (buf[2] == '0') {
+		buf[2] = 0;
+		if (buf[1] == '0')
+			buf[1] = 0;
+	}
+
+	fprintf(f, "%u.%s%s%s", v, buf, unit, post);
 }
 
 static void show_temperature(FILE *f, temperature_t temp, const char *pre, const char *post)
@@ -117,8 +133,6 @@ static void save_overview(FILE *f, struct dive *dive)
 	show_temperature(f, dive->watertemp, "  <watertemp>", "</watertemp>\n");
 	show_duration(f, dive->duration, "  <duration>", "</duration>\n");
 	show_duration(f, dive->surfacetime, "  <surfacetime>", "</surfacetime>\n");
-	show_pressure(f, dive->beginning_pressure, "  <cylinderstartpressure>", "</cylinderstartpressure>\n");
-	show_pressure(f, dive->end_pressure, "  <cylinderendpressure>", "</cylinderendpressure>\n");
 	show_utf8(f, dive->location, "  <location>","</location>\n");
 	show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
@@ -133,9 +147,11 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 		const char *description = cylinder->type.description;
 		int o2 = cylinder->gasmix.o2.permille;
 		int he = cylinder->gasmix.he.permille;
+		int start = cylinder->start.mbar;
+		int end = cylinder->end.mbar;
 
 		/* No cylinder information at all? */
-		if (!o2 && !volume)
+		if (!o2 && !volume && !start && !end)
 			return;
 		fprintf(f, "  <cylinder");
 		if (o2) {
@@ -147,6 +163,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 			show_milli(f, " size='", volume, " l", "'");
 		if (description)
 			fprintf(f, " description='%s'", description);
+		show_pressure(f, cylinder->start, " start='", "'");
+		show_pressure(f, cylinder->end, " end='", "'");
 		fprintf(f, " />\n");
 	}
 }