Sanitize and fix cylinder pressure overview

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

diff --git a/save-xml.c b/save-xml.c
index f629b452e1960760a3d61380b3f5733c7b767fdf..ddee64e2d1bfd13e97e118863f922eda4fef42d6 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -133,8 +133,6 @@ static void save_overview(FILE *f, struct dive *dive)
        show_temperature(f, dive->watertemp, "  <watertemp>", "</watertemp>\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");
        show_utf8(f, dive->location, "  <location>","</location>\n");
        show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
@@ -149,9 +147,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) {
@@ -163,6 +163,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");
        }
 }