X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;h=9ba7a54687d1d497024cc539fae066434fa82ecf;hb=9cf961249e197d6d8a3656968ce15dfd19e3ef3b;hp=ed55c022d4bf971e1d10802cf38c5399830ea98d;hpb=854bd0269c05adc56caf9667fd68f676520a2941;p=ext%2Fsubsurface.git

diff --git a/save-xml.c b/save-xml.c
index ed55c02..9ba7a54 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -97,6 +97,12 @@ static void quote(FILE *f, const char *text)
 		case '&':
 			escape = "&";
 			break;
+		case '\'':
+			escape = "'";
+			break;
+		case '\"':
+			escape = """;
+			break;
 		}
 		fwrite(text, (p - text - 1), 1, f);
 		if (!escape)
@@ -183,6 +189,7 @@ static void save_overview(FILE *f, struct dive *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)
@@ -274,6 +281,18 @@ static void save_events(FILE *f, struct event *ev)
 	}
 }
 
+static void save_trip(FILE *f, struct dive *trip)
+{
+	struct tm *tm = gmtime(&trip->when);
+
+	fprintf(f, "<trip");
+	fprintf(f, " date='%04u-%02u-%02u'",
+		tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+	if (trip->location)
+		show_utf8(f, trip->location, " location=\'","\'");
+	fprintf(f, " />\n");
+}
+
 static void save_dive(FILE *f, struct dive *dive)
 {
 	int i;
@@ -282,6 +301,8 @@ static void save_dive(FILE *f, struct dive *dive)
 	fputs("<dive", f);
 	if (dive->number)
 		fprintf(f, " number='%d'", dive->number);
+	if (dive->tripflag != TF_NONE)
+		fprintf(f, " tripflag='%s'", tripflag_names[dive->tripflag]);
 	if (dive->rating)
 		fprintf(f, " rating='%d'", dive->rating);
 	fprintf(f, " date='%04u-%02u-%02u'",
@@ -304,6 +325,8 @@ static void save_dive(FILE *f, struct dive *dive)
 void save_dives(const char *filename)
 {
 	int i;
+	GList *trip = NULL;
+
 	FILE *f = fopen(filename, "w");
 
 	if (!f)
@@ -313,6 +336,12 @@ void save_dives(const char *filename)
 	update_dive(current_dive);
 
 	fprintf(f, "<dives>\n<program name='subsurface' version='%d'></program>\n", VERSION);
+
+	/* save the trips */
+	while ((trip = NEXT_TRIP(trip, dive_trip_list)) != 0)
+		save_trip(f, trip->data);
+
+	/* save the dives */
 	for (i = 0; i < dive_table.nr; i++)
 		save_dive(f, get_dive(i));
 	fprintf(f, "</dives>\n");