Do gasmix as an empty element XML too

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

diff --git a/save-xml.c b/save-xml.c
index 29f22e6dd5cd0cf3d47aba59b357cfeb2e00e723..efff300886b54fe6a03031bff53b3d160802146f 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -18,15 +18,38 @@ static void show_temperature(FILE *f, temperature_t temp, const char *pre, const
                        sign = "-";
                        mcelsius = - mcelsius;
                }
-               fprintf(f, "%s%s%u.%03u%s", pre, sign, FRACTION(mcelsius, 1000), post);
+               fprintf(f, "%s%s%u.%03u C%s", pre, sign, FRACTION(mcelsius, 1000), post);
        }
 }
 
+static void show_depth(FILE *f, depth_t depth, const char *pre, const char *post)
+{
+       if (depth.mm)
+               fprintf(f, "%s%u.%03u m%s", pre, FRACTION(depth.mm, 1000), post);
+}
+
+static void show_duration(FILE *f, duration_t duration, const char *pre, const char *post)
+{
+       if (duration.seconds)
+               fprintf(f, "%s%u:%02u min%s", pre, FRACTION(duration.seconds, 60), post);
+}
+
+static void show_pressure(FILE *f, pressure_t pressure, const char *pre, const char *post)
+{
+       if (pressure.mbar)
+               fprintf(f, "%s%u.%03u bar%s", pre, FRACTION(pressure.mbar, 1000), post);
+}
+
 static void save_overview(FILE *f, struct dive *dive)
 {
-       fprintf(f, "  <maxdepth>%u.%03u m</maxdepth>\n", FRACTION(dive->maxdepth.mm, 1000));
-       show_temperature(f, dive->airtemp, "  <airtemp>", " C</airtemp>\n");
-       show_temperature(f, dive->watertemp, "  <watertemp>", " C</airtemp>\n");
+       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>", "</airtemp>\n");
+       show_duration(f, dive->duration, "  <duration>", "</duration>\n");
+       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");
 }
 
 static void save_gasmix(FILE *f, struct dive *dive)
@@ -43,21 +66,20 @@ static void save_gasmix(FILE *f, struct dive *dive)
                fprintf(f, "  <gasmix o2='%u.%u%%'", FRACTION(o2, 10));
                if (mix->he.permille)
                        fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
-               fprintf(f, " n2='%u.%u%%'></gasmix>\n", FRACTION(n2, 10));
+               fprintf(f, " n2='%u.%u%%' />\n", FRACTION(n2, 10));
        }
 }
 
 static void save_sample(FILE *f, struct sample *sample)
 {
-       fprintf(f, "  <sample time='%u:%02u' depth='%u.%03u'",
+       fprintf(f, "  <sample time='%u:%02u min' depth='%u.%03u m'",
                FRACTION(sample->time.seconds,60),
                FRACTION(sample->depth.mm, 1000));
-       show_temperature(f, sample->temperature, " temp='", " C'");
-       if (sample->tankpressure.mbar) {
-               fprintf(f, " pressure='%u.%03u bar'",
-                       FRACTION(sample->tankpressure.mbar, 1000));
-       }
-       fprintf(f, "></sample>\n");
+       show_temperature(f, sample->temperature, " temp='", "'");
+       show_pressure(f, sample->tankpressure, " pressure='", "'");
+       if (sample->tankindex)
+               fprintf(f, " tankindex='%d'", sample->tankindex);
+       fprintf(f, " />\n");
 }
 
 static void save_dive(FILE *f, struct dive *dive)
@@ -65,8 +87,8 @@ static void save_dive(FILE *f, struct dive *dive)
        int i;
        struct tm *tm = gmtime(&dive->when);
 
-       fprintf(f, "<dive date='%02u.%02u.%u' time='%02u:%02u:%02u'>\n",
-               tm->tm_mday, tm->tm_mon+1, tm->tm_year+1900,
+       fprintf(f, "<dive date='%04u-%02u-%02u' time='%02u:%02u:%02u'>\n",
+               tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday,
                tm->tm_hour, tm->tm_min, tm->tm_sec);
        save_overview(f, dive);
        save_gasmix(f, dive);