X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=save-xml.c;fp=save-xml.c;h=07b8b80969d25f28616499083b8aab452127fd22;hb=04c98344b3c50b58dcc62eeb6d13e11030eb662d;hp=ddee64e2d1bfd13e97e118863f922eda4fef42d6;hpb=5f79a804b925a8ffbcf933bb6fae4f764b518c8e;p=ext%2Fsubsurface.git diff --git a/save-xml.c b/save-xml.c index ddee64e..07b8b80 100644 --- a/save-xml.c +++ b/save-xml.c @@ -125,13 +125,32 @@ static void show_utf8(FILE *f, const char *text, const char *pre, const char *po 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(" 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(" 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, " ", "\n"); - show_depth(f, dive->meandepth, " ", "\n"); - show_temperature(f, dive->airtemp, " ", "\n"); - show_temperature(f, dive->watertemp, " ", "\n"); - show_duration(f, dive->duration, " ", "\n"); + save_depths(f, dive); + save_temperatures(f, dive); show_duration(f, dive->surfacetime, " ", "\n"); show_utf8(f, dive->location, " ","\n"); show_utf8(f, dive->notes, " ","\n"); @@ -185,9 +204,10 @@ static void save_dive(FILE *f, struct dive *dive) int i; struct tm *tm = gmtime(&dive->when); - fprintf(f, "\n", + fprintf(f, "\n", tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec); + tm->tm_hour, tm->tm_min, tm->tm_sec, + FRACTION(dive->duration.seconds, 60)); save_overview(f, dive); save_cylinder_info(f, dive); for (i = 0; i < dive->samples; i++)