Turn dive depth, temperature and duration into xml attributes

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

diff --git a/save-xml.c b/save-xml.c
index 7609b1db87b2baf2870eea776c717a09f0fe7256..07b8b80969d25f28616499083b8aab452127fd22 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -11,12 +11,28 @@
 
 static void show_milli(FILE *f, const char *pre, int value, const char *unit, const char *post)
 {
+       int i;
+       char buf[4];
+       unsigned v;
+
        fputs(pre, f);
+       v = value;
        if (value < 0) {
                putc('-', f);
-               value = -value;
+               v = -value;
+       }
+       for (i = 2; i >= 0; i--) {
+               buf[i] = (v % 10) + '0';
+               v /= 10;
+       }
+       buf[3] = 0;
+       if (buf[2] == '0') {
+               buf[2] = 0;
+               if (buf[1] == '0')
+                       buf[1] = 0;
        }
-       fprintf(f, "%u.%03u%s%s", FRACTION(value, 1000), unit, post);
+
+       fprintf(f, "%u.%s%s%s", v, buf, unit, post);
 }
 
 static void show_temperature(FILE *f, temperature_t temp, const char *pre, const char *post)
@@ -109,16 +125,33 @@ 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_pressure(f, dive->beginning_pressure, "  <cylinderstartpressure>", "</cylinderstartpressure>\n");
-       show_pressure(f, dive->end_pressure, "  <cylinderendpressure>", "</cylinderendpressure>\n");
        show_utf8(f, dive->location, "  <location>","</location>\n");
        show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
@@ -133,9 +166,11 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                const char *description = cylinder->type.description;
                int o2 = cylinder->gasmix.o2.permille;
                int he = cylinder->gasmix.he.permille;
+               int start = cylinder->start.mbar;
+               int end = cylinder->end.mbar;
 
                /* No cylinder information at all? */
-               if (!o2 && !volume)
+               if (!o2 && !volume && !start && !end)
                        return;
                fprintf(f, "  <cylinder");
                if (o2) {
@@ -147,6 +182,8 @@ static void save_cylinder_info(FILE *f, struct dive *dive)
                        show_milli(f, " size='", volume, " l", "'");
                if (description)
                        fprintf(f, " description='%s'", description);
+               show_pressure(f, cylinder->start, " start='", "'");
+               show_pressure(f, cylinder->end, " end='", "'");
                fprintf(f, " />\n");
        }
 }
@@ -167,9 +204,10 @@ 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",
+       fprintf(f, "<dive date='%04u-%02u-%02u' time='%02u:%02u:%02u' duration='%u:%02u min'>\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++)