X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=ed55c022d4bf971e1d10802cf38c5399830ea98d;hb=4912951e97b4040941944e1df70a91366a6a5559;hp=80c26b88260fd70665fd0934c2fe79b6c6980486;hpb=af290d5eb281662d336b8186a9df1a489d78ec9d;p=ext%2Fsubsurface.git

diff --git a/save-xml.c b/save-xml.c
index 80c26b8..ed55c02 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -182,7 +182,6 @@ static void save_overview(FILE *f, struct dive *dive)
 	show_location(f, dive);
 	show_utf8(f, dive->divemaster, "  <divemaster>","</divemaster>\n");
 	show_utf8(f, dive->buddy, "  <buddy>","</buddy>\n");
-	fprintf(f, "  <rating>%d</rating>\n", dive->rating);
 	show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
 
@@ -219,6 +218,26 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
 	}
 }
 
+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)
@@ -263,6 +282,8 @@ static void save_dive(FILE *f, struct dive *dive)
 	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'",
@@ -271,6 +292,7 @@ static void save_dive(FILE *f, struct dive *dive)
 		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);