*/
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);
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)
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)
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);