Add divemaster/buddy field and text entry

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

diff --git a/save-xml.c b/save-xml.c
index e47092ebcb9d9dee241e08f1a1396446edbcfb21..47a8a7ebb23767de9e8202ca90e3b101a142bacd 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -153,6 +153,8 @@ static void save_overview(FILE *f, struct dive *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");
 }
 
@@ -181,7 +183,7 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                if (volume)
                        show_milli(f, " size='", volume, " l", "'");
                show_pressure(f, cylinder->type.workingpressure, " workpressure='", "'");
-               if (description)
+               if (description && *description)
                        fprintf(f, " description='%s'", description);
                show_pressure(f, cylinder->start, " start='", "'");
                show_pressure(f, cylinder->end, " end='", "'");
@@ -206,8 +208,8 @@ static void save_dive(FILE *f, struct dive *dive)
        struct tm *tm = gmtime(&dive->when);
 
        fputs("<dive", f);
-       if (dive->nr)
-               fprintf(f, " nr='%d'", dive->nr);
+       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'",
@@ -232,7 +234,7 @@ void save_dives(const char *filename)
                return;
 
        /* Flush any edits of current dives back to the dives! */
-       update_dive(NULL);
+       update_dive(current_dive);
 
        fprintf(f, "<dives>\n<program name='diveclog' version='%d'></program>\n", VERSION);
        for (i = 0; i < dive_table.nr; i++)