X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=07b8b80969d25f28616499083b8aab452127fd22;hb=04c98344b3c50b58dcc62eeb6d13e11030eb662d;hp=5c05723b71e1ebf5df39a0c9f977d6d0f6ccb6e5;hpb=bcf12edfe9f9f00d39736d1cff791dbe8809f6f1;p=ext%2Fsubsurface.git

diff --git a/save-xml.c b/save-xml.c
index 5c05723..07b8b80 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -9,23 +9,42 @@
 
 #define FRACTION(n,x) ((unsigned)(n)/(x)),((unsigned)(n)%(x))
 
-static void show_temperature(FILE *f, temperature_t temp, const char *pre, const char *post)
+static void show_milli(FILE *f, const char *pre, int value, const char *unit, const char *post)
 {
-	if (temp.mkelvin) {
-		int mcelsius = temp.mkelvin - 273150;
-		const char *sign ="";
-		if (mcelsius < 0) {
-			sign = "-";
-			mcelsius = - mcelsius;
-		}
-		fprintf(f, "%s%s%u.%03u C%s", pre, sign, FRACTION(mcelsius, 1000), post);
+	int i;
+	char buf[4];
+	unsigned v;
+
+	fputs(pre, f);
+	v = value;
+	if (value < 0) {
+		putc('-', f);
+		v = -value;
+	}
+	for (i = 2; i >= 0; i--) {
+		buf[i] = (v % 10) + '0';
+		v /= 10;
 	}
+	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)
+{
+	if (temp.mkelvin)
+		show_milli(f, pre, temp.mkelvin - 273150, " C", post);
 }
 
 static void show_depth(FILE *f, depth_t depth, const char *pre, const char *post)
 {
 	if (depth.mm)
-		fprintf(f, "%s%u.%03u m%s", pre, FRACTION(depth.mm, 1000), post);
+		show_milli(f, pre, depth.mm, " m", post);
 }
 
 static void show_duration(FILE *f, duration_t duration, const char *pre, const char *post)
@@ -37,7 +56,7 @@ static void show_duration(FILE *f, duration_t duration, const char *pre, const c
 static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const char *post)
 {
 	if (pressure.mbar)
-		fprintf(f, "%s%u.%03u bar%s", pre, FRACTION(pressure.mbar, 1000), post);
+		show_milli(f, pre, pressure.mbar, " bar", post);
 }
 
 /*
@@ -106,16 +125,33 @@ static void show_utf8(FILE *f, const char *text, const char *pre, const char *po
 	fputs(post, f);
 }
 
+static void save_depths(FILE *f, struct dive *dive)
+{
+	/* What's the point of this dive entry again? */
+	if (!dive->maxdepth.mm && !dive->meandepth.mm)
+		return;
+
+	fputs("  <depth", f);
+	show_depth(f, dive->maxdepth, " max='", "'");
+	show_depth(f, dive->meandepth, " mean='", "'");
+	fputs(" />\n", f);
+}
+
+static void save_temperatures(FILE *f, struct dive *dive)
+{
+	if (!dive->airtemp.mkelvin && !dive->watertemp.mkelvin)
+		return;
+	fputs("  <temperature", f);
+	show_temperature(f, dive->airtemp, " air='", "'");
+	show_temperature(f, dive->watertemp, " water='", "'");
+	fputs(" />\n", f);
+}
+
 static void save_overview(FILE *f, struct dive *dive)
 {
-	show_depth(f, dive->maxdepth, "  <maxdepth>", "</maxdepth>\n");
-	show_depth(f, dive->meandepth, "  <meandepth>", "</meandepth>\n");
-	show_temperature(f, dive->airtemp, "  <airtemp>", "</airtemp>\n");
-	show_temperature(f, dive->watertemp, "  <watertemp>", "</watertemp>\n");
-	show_duration(f, dive->duration, "  <duration>", "</duration>\n");
+	save_depths(f, dive);
+	save_temperatures(f, dive);
 	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");
 }
@@ -127,12 +163,14 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 	for (i = 0; i < MAX_CYLINDERS; i++) {
 		cylinder_t *cylinder = dive->cylinder+i;
 		int volume = cylinder->type.size.mliter;
-		int pressure = cylinder->type.workingpressure.mbar;
+		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) {
@@ -140,20 +178,20 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 			if (he)
 				fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
 		}
-		if (volume) {
-			fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
-			if (pressure)
-				fprintf(f, " workpressure='%u.%03u bar'", FRACTION(pressure, 1000));
-		}
+		if (volume)
+			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");
 	}
 }
 
 static void save_sample(FILE *f, struct sample *sample)
 {
-	fprintf(f, "  <sample time='%u:%02u min' depth='%u.%03u m'",
-		FRACTION(sample->time.seconds,60),
-		FRACTION(sample->depth.mm, 1000));
+	fprintf(f, "  <sample time='%u:%02u min'", FRACTION(sample->time.seconds,60));
+	show_milli(f, " depth='", sample->depth.mm, " m", "'");
 	show_temperature(f, sample->temperature, " temp='", "'");
 	show_pressure(f, sample->cylinderpressure, " pressure='", "'");
 	if (sample->cylinderindex)
@@ -166,9 +204,10 @@ static void save_dive(FILE *f, struct dive *dive)
 	int i;
 	struct tm *tm = gmtime(&dive->when);
 
-	fprintf(f, "<dive date='%04u-%02u-%02u' time='%02u:%02u:%02u'>\n",
+	fprintf(f, "<dive date='%04u-%02u-%02u' time='%02u:%02u:%02u' duration='%u:%02u min'>\n",
 		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
-		tm->tm_hour, tm->tm_min, tm->tm_sec);
+		tm->tm_hour, tm->tm_min, tm->tm_sec,
+		FRACTION(dive->duration.seconds, 60));
 	save_overview(f, dive);
 	save_cylinder_info(f, dive);
 	for (i = 0; i < dive->samples; i++)