X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=save-xml.c;h=3464cd6d31254f67f515b994c76cc14aca2de1bc;hb=d96b504bc4f926de86d06c3797b2fbcafb8727bf;hp=80c26b88260fd70665fd0934c2fe79b6c6980486;hpb=af290d5eb281662d336b8186a9df1a489d78ec9d;p=ext%2Fsubsurface.git
diff --git a/save-xml.c b/save-xml.c
index 80c26b8..3464cd6 100644
--- a/save-xml.c
+++ b/save-xml.c
@@ -67,10 +67,9 @@ static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const c
* 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).
+ * If we do this for attributes, we need to quote the quotes we use too.
*/
-static void quote(FILE *f, const char *text)
+static void quote(FILE *f, const char *text, int is_attribute)
{
const char *p = text;
@@ -97,6 +96,16 @@ static void quote(FILE *f, const char *text)
case '&':
escape = "&";
break;
+ case '\'':
+ if (!is_attribute)
+ continue;
+ escape = "'";
+ break;
+ case '\"':
+ if (!is_attribute)
+ continue;
+ escape = """;
+ break;
}
fwrite(text, (p - text - 1), 1, f);
if (!escape)
@@ -106,7 +115,7 @@ static void quote(FILE *f, const char *text)
}
}
-static void show_utf8(FILE *f, const char *text, const char *pre, const char *post)
+static void show_utf8(FILE *f, const char *text, const char *pre, const char *post, int is_attribute)
{
int len;
@@ -121,7 +130,7 @@ static void show_utf8(FILE *f, const char *text, const char *pre, const char *po
len--;
/* FIXME! Quoting! */
fputs(pre, f);
- quote(f, text);
+ quote(f, text, is_attribute);
fputs(post, f);
}
@@ -171,7 +180,7 @@ static void show_location(FILE *f, struct dive *dive)
}
prefix = buffer;
}
- show_utf8(f, dive->location, prefix,"\n");
+ show_utf8(f, dive->location, prefix,"\n", 0);
}
static void save_overview(FILE *f, struct dive *dive)
@@ -180,10 +189,10 @@ static void save_overview(FILE *f, struct dive *dive)
save_temperatures(f, dive);
show_duration(f, dive->surfacetime, " ", "\n");
show_location(f, dive);
- show_utf8(f, dive->divemaster, " ","\n");
- show_utf8(f, dive->buddy, " ","\n");
- fprintf(f, " %d\n", dive->rating);
- show_utf8(f, dive->notes, " ","\n");
+ show_utf8(f, dive->divemaster, " ","\n", 0);
+ show_utf8(f, dive->buddy, " ","\n", 0);
+ show_utf8(f, dive->notes, " ","\n", 0);
+ show_utf8(f, dive->suit, " ","\n", 0);
}
static void save_cylinder_info(FILE *f, struct dive *dive)
@@ -219,6 +228,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, " \n");
+ }
+}
+
static void show_index(FILE *f, int value, const char *pre, const char *post)
{
if (value)
@@ -242,7 +271,7 @@ static void save_one_event(FILE *f, struct event *ev)
show_index(f, ev->type, "type='", "'");
show_index(f, ev->flags, "flags='", "'");
show_index(f, ev->value, "value='", "'");
- show_utf8(f, ev->name, " name='", "'");
+ show_utf8(f, ev->name, " name='", "'", 1);
fprintf(f, " />\n");
}
@@ -263,6 +292,8 @@ static void save_dive(FILE *f, struct dive *dive)
fputs("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 +302,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);