* 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;
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)
}
}
-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;
len--;
/* FIXME! Quoting! */
fputs(pre, f);
- quote(f, text);
+ quote(f, text, is_attribute);
fputs(post, f);
}
*/
if (latitude || longitude) {
int len = snprintf(buffer, sizeof(buffer)-4,
- " <location gps='%f %f'>",
+ " <location gps='%.12g %.12g'>",
latitude, longitude);
if (!dive->location) {
memcpy(&buffer[len-1], "/>\n", 4);
}
prefix = buffer;
}
- show_utf8(f, dive->location, prefix,"</location>\n");
+ show_utf8(f, dive->location, prefix,"</location>\n", 0);
}
static void save_overview(FILE *f, struct dive *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->divemaster, " <divemaster>","</divemaster>\n", 0);
+ show_utf8(f, dive->buddy, " <buddy>","</buddy>\n", 0);
+ show_utf8(f, dive->notes, " <notes>","</notes>\n", 0);
+ show_utf8(f, dive->suit, " <suit>","</suit>\n", 0);
}
static void save_cylinder_info(FILE *f, struct dive *dive)
if (!o2 && !volume && !start && !end)
return;
fprintf(f, " <cylinder");
- 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", "'");
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 min'", FRACTION(sample->time.seconds,60));
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='", "'", 1);
+ 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;
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'",
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");