fputs(post, f);
}
+static void save_depths(FILE *f, struct dive *dive)
+{
+ /* What's the point of this dive entry again? */
+ if (!dive->maxdepth.mm && !dive->meandepth.mm)
+ return;
+
+ fputs(" <depth", f);
+ show_depth(f, dive->maxdepth, " max='", "'");
+ show_depth(f, dive->meandepth, " mean='", "'");
+ fputs(" />\n", f);
+}
+
+static void save_temperatures(FILE *f, struct dive *dive)
+{
+ if (!dive->airtemp.mkelvin && !dive->watertemp.mkelvin)
+ return;
+ fputs(" <temperature", f);
+ show_temperature(f, dive->airtemp, " air='", "'");
+ show_temperature(f, dive->watertemp, " water='", "'");
+ fputs(" />\n", f);
+}
+
static void save_overview(FILE *f, struct dive *dive)
{
- show_depth(f, dive->maxdepth, " <maxdepth>", "</maxdepth>\n");
- show_depth(f, dive->meandepth, " <meandepth>", "</meandepth>\n");
- show_temperature(f, dive->airtemp, " <airtemp>", "</airtemp>\n");
- show_temperature(f, dive->watertemp, " <watertemp>", "</watertemp>\n");
- show_duration(f, dive->duration, " <duration>", "</duration>\n");
+ save_depths(f, dive);
+ save_temperatures(f, dive);
show_duration(f, dive->surfacetime, " <surfacetime>", "</surfacetime>\n");
show_utf8(f, dive->location, " <location>","</location>\n");
show_utf8(f, dive->notes, " <notes>","</notes>\n");
}
if (volume)
show_milli(f, " size='", volume, " l", "'");
- if (description)
+ show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'");
+ if (description && *description)
fprintf(f, " description='%s'", description);
show_pressure(f, cylinder->start, " start='", "'");
show_pressure(f, cylinder->end, " end='", "'");
int i;
struct tm *tm = gmtime(&dive->when);
- fprintf(f, "<dive date='%04u-%02u-%02u' time='%02u:%02u:%02u'>\n",
- tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
+ fputs("<dive", f);
+ if (dive->number)
+ fprintf(f, " number='%d'", dive->number);
+ fprintf(f, " date='%04u-%02u-%02u'",
+ tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+ fprintf(f, " time='%02u:%02u:%02u'",
tm->tm_hour, tm->tm_min, tm->tm_sec);
+ fprintf(f, " duration='%u:%02u min'>\n",
+ FRACTION(dive->duration.seconds, 60));
save_overview(f, dive);
save_cylinder_info(f, dive);
for (i = 0; i < dive->samples; i++)
return;
/* Flush any edits of current dives back to the dives! */
- flush_dive_info_changes();
+ update_dive(current_dive);
fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION);
for (i = 0; i < dive_table.nr; i++)