Add divemaster/buddy field and text entry

[ext/subsurface.git] / save-xml.c

diff --git a/save-xml.c b/save-xml.c
index ddee64e2d1bfd13e97e118863f922eda4fef42d6..47a8a7ebb23767de9e8202ca90e3b101a142bacd 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -125,15 +125,36 @@ 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("  <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->divemaster, "  <divemaster>","</divemaster>\n");
+       show_utf8(f, dive->buddy, "  <buddy>","</buddy>\n");
        show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
 
@@ -161,7 +182,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                }
                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='", "'");
@@ -185,9 +207,15 @@ static void save_dive(FILE *f, struct dive *dive)
        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++)
@@ -206,7 +234,7 @@ void save_dives(const char *filename)
                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++)