X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=save-xml.c;h=37d6d062eabf836f188b8cfc2bcd0b6feae0c6a4;hp=f629b452e1960760a3d61380b3f5733c7b767fdf;hb=b693bb3fb962c54767f8430058575441df243b13;hpb=5c6aa56ff1fcf4b92b0bc56792a82e1ef609ea60

diff --git a/save-xml.c b/save-xml.c
index f629b45..37d6d06 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -125,18 +125,65 @@ 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 show_location(FILE *f, struct dive *dive)
+{
+	char buffer[80];
+	const char *prefix = "  <location>";
+	double latitude = dive->latitude;
+	double longitude = dive->longitude;
+
+	/*
+	 * Ok, theoretically I guess you could dive at
+	 * exactly 0,0. But we don't support that. So
+	 * if you do, just fudge it a bit, and say that
+	 * you dove a few meters away.
+	 */
+	if (latitude || longitude) {
+		int len = snprintf(buffer, sizeof(buffer)-4,
+			"  <location gps='%.12g %.12g'>",
+			latitude, longitude);
+		if (!dive->location) {
+			memcpy(&buffer[len-1], "/>\n", 4);
+			fputs(buffer, f);
+			return;
+		}
+		prefix = buffer;
+	}
+	show_utf8(f, dive->location, prefix,"</location>\n");
+}
+
 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_location(f, dive);
+	show_utf8(f, dive->divemaster, "  <divemaster>","</divemaster>\n");
+	show_utf8(f, dive->buddy, "  <buddy>","</buddy>\n");
 	show_utf8(f, dive->notes, "  <notes>","</notes>\n");
+	show_utf8(f, dive->suit, "  <suit>","</suit>\n");
 }
 
 static void save_cylinder_info(FILE *f, struct dive *dive)
@@ -149,24 +196,55 @@ 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 (volume)
+			show_milli(f, " size='", volume, " l", "'");
+		show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'");
+		if (description && *description)
+			fprintf(f, " description='%s'", description);
 		if (o2) {
 			fprintf(f, " o2='%u.%u%%'", FRACTION(o2, 10));
 			if (he)
 				fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
 		}
-		if (volume)
-			show_milli(f, " size='", volume, " l", "'");
-		if (description)
+		show_pressure(f, cylinder->start, " start='", "'");
+		show_pressure(f, cylinder->end, " end='", "'");
+		fprintf(f, " />\n");
+	}
+}
+
+static void save_weightsystem_info(FILE *f, struct dive *dive)
+{
+	int i;
+
+	for (i = 0; i < MAX_WEIGHTSYSTEMS; i++) {
+		weightsystem_t *ws = dive->weightsystem+i;
+		int grams = ws->weight.grams;
+		const char *description = ws->description;
+
+		/* No weight information at all? */
+		if (grams == 0)
+			return;
+		fprintf(f, "  <weightsystem");
+		show_milli(f, " weight='", grams, " kg", "'");
+		if (description && *description)
 			fprintf(f, " description='%s'", description);
 		fprintf(f, " />\n");
 	}
 }
 
+static void show_index(FILE *f, int value, const char *pre, const char *post)
+{
+	if (value)
+		fprintf(f, " %s%d%s", pre, value, post);
+}
+
 static void save_sample(FILE *f, struct sample *sample)
 {
 	fprintf(f, "  <sample time='%u:%02u min'", FRACTION(sample->time.seconds,60));
@@ -178,16 +256,45 @@ static void save_sample(FILE *f, struct sample *sample)
 	fprintf(f, " />\n");
 }
 
+static void save_one_event(FILE *f, struct event *ev)
+{
+	fprintf(f, "  <event time='%d:%02d min'", FRACTION(ev->time.seconds,60));
+	show_index(f, ev->type, "type='", "'");
+	show_index(f, ev->flags, "flags='", "'");
+	show_index(f, ev->value, "value='", "'");
+	show_utf8(f, ev->name, " name='", "'");
+	fprintf(f, " />\n");
+}
+
+
+static void save_events(FILE *f, struct event *ev)
+{
+	while (ev) {
+		save_one_event(f, ev);
+		ev = ev->next;
+	}
+}
+
 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",
-		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+	fputs("<dive", f);
+	if (dive->number)
+		fprintf(f, " number='%d'", dive->number);
+	if (dive->rating)
+		fprintf(f, " rating='%d'", dive->rating);
+	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);
+	save_weightsystem_info(f, dive);
+	save_events(f, dive->events);
 	for (i = 0; i < dive->samples; i++)
 		save_sample(f, dive->sample+i);
 	fprintf(f, "</dive>\n");
@@ -204,9 +311,9 @@ void save_dives(const char *filename)
 		return;
 
 	/* Flush any edits of current dives back to the dives! */
-	flush_dive_info_changes();
+	update_dive(current_dive);
 
-	fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION);
+	fprintf(f, "<dives>\n<program name='subsurface' version='%d'></program>\n", VERSION);
 	for (i = 0; i < dive_table.nr; i++)
 		save_dive(f, get_dive(i));
 	fprintf(f, "</dives>\n");