X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=91ead9f1d6d6eab18cdc093f559dedb1a8785408;hb=b19b76ecfa1ae206f7d272a50d9dc28c1942726b;hp=c93a828cc54f8fa5b1c29eb28bf7b42762fe034e;hpb=b17c7f07095da886a688de2d36f79d433d6110b9;p=ext%2Fsubsurface.git

diff --git a/save-xml.c b/save-xml.c
index c93a828..91ead9f 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -181,7 +181,7 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 		if (volume)
 			show_milli(f, " size='", volume, " l", "'");
 		show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'");
-		if (description)
+		if (description && *description)
 			fprintf(f, " description='%s'", description);
 		show_pressure(f, cylinder->start, " start='", "'");
 		show_pressure(f, cylinder->end, " end='", "'");
@@ -205,9 +205,14 @@ 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' 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,
+	fputs("<dive", f);
+	if (dive->number)
+		fprintf(f, " number='%d'", dive->number);
+	fprintf(f, " date='%04u-%02u-%02u'",
+		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+	fprintf(f, " time='%02u:%02u:%02u'",
+		tm->tm_hour, tm->tm_min, tm->tm_sec);
+	fprintf(f, " duration='%u:%02u min'>\n",
 		FRACTION(dive->duration.seconds, 60));
 	save_overview(f, dive);
 	save_cylinder_info(f, dive);
@@ -227,7 +232,7 @@ void save_dives(const char *filename)
 		return;
 
 	/* Flush any edits of current dives back to the dives! */
-	update_dive(NULL);
+	update_dive(current_dive);
 
 	fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION);
 	for (i = 0; i < dive_table.nr; i++)