X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=save-xml.c;h=37d6d062eabf836f188b8cfc2bcd0b6feae0c6a4;hp=29f22e6dd5cd0cf3d47aba59b357cfeb2e00e723;hb=ed1ce8ebc8590533291a9c5d6460f8d1c9f857dd;hpb=99c111e34833bb7b8af2ad5a6494790191b18e2c

diff --git a/save-xml.c b/save-xml.c
index 29f22e6..37d6d06 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -9,55 +9,270 @@
 
 #define FRACTION(n,x) ((unsigned)(n)/(x)),((unsigned)(n)%(x))
 
+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);
+		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) {
-		int mcelsius = temp.mkelvin - 273150;
-		const char *sign ="";
-		if (mcelsius < 0) {
-			sign = "-";
-			mcelsius = - mcelsius;
+	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)
+		show_milli(f, pre, depth.mm, " m", post);
+}
+
+static void show_duration(FILE *f, duration_t duration, const char *pre, const char *post)
+{
+	if (duration.seconds)
+		fprintf(f, "%s%u:%02u min%s", pre, FRACTION(duration.seconds, 60), post);
+}
+
+static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const char *post)
+{
+	if (pressure.mbar)
+		show_milli(f, pre, pressure.mbar, " bar", post);
+}
+
+/*
+ * We're outputting utf8 in xml.
+ * We need to quote the characters <, >, &.
+ *
+ * Technically I don't think we'd necessarily need to quote the control
+ * characters, but at least libxml2 doesn't like them. It doesn't even
+ * allow them quoted. So we just skip them and replace them with '?'.
+ *
+ * Nothing else (and if we ever do this using attributes, we'd need to
+ * quote the quotes we use too).
+ */
+static void quote(FILE *f, const char *text)
+{
+	const char *p = text;
+
+	for (;;) {
+		const char *escape;
+
+		switch (*p++) {
+		default:
+			continue;
+		case 0:
+			escape = NULL;
+			break;
+		case 1 ... 8:
+		case 11: case 12:
+		case 14 ... 31:
+			escape = "?";
+			break;
+		case '<':
+			escape = "&lt;";
+			break;
+		case '>':
+			escape = "&gt;";
+			break;
+		case '&':
+			escape = "&amp;";
+			break;
+		}
+		fwrite(text, (p - text - 1), 1, f);
+		if (!escape)
+			break;
+		fputs(escape, f);
+		text = p;
+	}
+}
+
+static void show_utf8(FILE *f, const char *text, const char *pre, const char *post)
+{
+	int len;
+
+	if (!text)
+		return;
+	while (isspace(*text))
+		text++;
+	len = strlen(text);
+	if (!len)
+		return;
+	while (len && isspace(text[len-1]))
+		len--;
+	/* FIXME! Quoting! */
+	fputs(pre, f);
+	quote(f, text);
+	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;
 		}
-		fprintf(f, "%s%s%u.%03u%s", pre, sign, FRACTION(mcelsius, 1000), post);
+		prefix = buffer;
 	}
+	show_utf8(f, dive->location, prefix,"</location>\n");
 }
 
 static void save_overview(FILE *f, struct dive *dive)
 {
-	fprintf(f, "  <maxdepth>%u.%03u m</maxdepth>\n", FRACTION(dive->maxdepth.mm, 1000));
-	show_temperature(f, dive->airtemp, "  <airtemp>", " C</airtemp>\n");
-	show_temperature(f, dive->watertemp, "  <watertemp>", " C</airtemp>\n");
+	save_depths(f, dive);
+	save_temperatures(f, dive);
+	show_duration(f, dive->surfacetime, "  <surfacetime>", "</surfacetime>\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_gasmix(FILE *f, struct dive *dive)
+static void save_cylinder_info(FILE *f, struct dive *dive)
 {
 	int i;
 
-	for (i = 0; i < MAX_MIXES; i++) {
-		gasmix_t *mix = dive->gasmix+i;
-		int o2 = mix->o2.permille, he = mix->he.permille;
-		int n2 = 1000 - o2 - he;
+	for (i = 0; i < MAX_CYLINDERS; i++) {
+		cylinder_t *cylinder = dive->cylinder+i;
+		int volume = cylinder->type.size.mliter;
+		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;
 
-		if (!mix->o2.permille)
+		/* No cylinder information at all? */
+		if (!o2 && !volume && !start && !end)
 			return;
-		fprintf(f, "  <gasmix o2='%u.%u%%'", FRACTION(o2, 10));
-		if (mix->he.permille)
-			fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
-		fprintf(f, " n2='%u.%u%%'></gasmix>\n", FRACTION(n2, 10));
+		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));
+		}
+		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' depth='%u.%03u'",
-		FRACTION(sample->time.seconds,60),
-		FRACTION(sample->depth.mm, 1000));
-	show_temperature(f, sample->temperature, " temp='", " C'");
-	if (sample->tankpressure.mbar) {
-		fprintf(f, " pressure='%u.%03u bar'",
-			FRACTION(sample->tankpressure.mbar, 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)
+		fprintf(f, " cylinderindex='%d'", sample->cylinderindex);
+	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;
 	}
-	fprintf(f, "></sample>\n");
 }
 
 static void save_dive(FILE *f, struct dive *dive)
@@ -65,11 +280,21 @@ static void save_dive(FILE *f, struct dive *dive)
 	int i;
 	struct tm *tm = gmtime(&dive->when);
 
-	fprintf(f, "<dive date='%02u.%02u.%u' time='%02u:%02u:%02u'>\n",
-		tm->tm_mday, tm->tm_mon+1, tm->tm_year+1900,
+	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_gasmix(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");
@@ -84,8 +309,13 @@ void save_dives(const char *filename)
 
 	if (!f)
 		return;
-	fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION);
+
+	/* Flush any edits of current dives back to the dives! */
+	update_dive(current_dive);
+
+	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");
+	fclose(f);
 }