Properly save/restore cylinder description string

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

diff --git a/save-xml.c b/save-xml.c
index b91e24e8d57bcb97e8ab68299bad8f55d9461696..64d65471132d3340756e1ff274c9ed807fe848c1 100644 (file)
--- a/save-xml.c
+++ b/save-xml.c
@@ -111,7 +111,7 @@ 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>", "</airtemp>\n");
+       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");
@@ -120,21 +120,31 @@ static void save_overview(FILE *f, struct dive *dive)
        show_utf8(f, dive->notes, "  <notes>","</notes>\n");
 }
 
-static void save_gasmix(FILE *f, struct dive *dive)
+static void save_cylinder_info(FILE *f, struct dive *dive)
 {
        int i;
 
-       for (i = 0; i < MAX_MIXES; i++) {
-               gasmix_t *mix = dive->gasmix+i;
-               int o2 = mix->o2.permille, he = mix->he.permille;
-               int n2 = 1000 - o2 - he;
+       for (i = 0; i < MAX_CYLINDERS; i++) {
+               cylinder_t *cylinder = dive->cylinder+i;
+               int volume = cylinder->type.size.mliter;
+               const char *description = cylinder->type.description;
+               int o2 = cylinder->gasmix.o2.permille;
+               int he = cylinder->gasmix.he.permille;
 
-               if (!mix->o2.permille)
+               /* No cylinder information at all? */
+               if (!o2 && !volume)
                        return;
-               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%%' />\n", FRACTION(n2, 10));
+               fprintf(f, "  <cylinder");
+               if (o2) {
+                       fprintf(f, " o2='%u.%u%%'", FRACTION(o2, 10));
+                       if (he)
+                               fprintf(f, " he='%u.%u%%'", FRACTION(he, 10));
+               }
+               if (volume)
+                       fprintf(f, " size='%u.%03u l'", FRACTION(volume, 1000));
+               if (description)
+                       fprintf(f, " description='%s'", description);
+               fprintf(f, " />\n");
        }
 }
 
@@ -144,9 +154,9 @@ static void save_sample(FILE *f, struct sample *sample)
                FRACTION(sample->time.seconds,60),
                FRACTION(sample->depth.mm, 1000));
        show_temperature(f, sample->temperature, " temp='", "'");
-       show_pressure(f, sample->tankpressure, " pressure='", "'");
-       if (sample->tankindex)
-               fprintf(f, " tankindex='%d'", sample->tankindex);
+       show_pressure(f, sample->cylinderpressure, " pressure='", "'");
+       if (sample->cylinderindex)
+               fprintf(f, " cylinderindex='%d'", sample->cylinderindex);
        fprintf(f, " />\n");
 }
 
@@ -159,7 +169,7 @@ static void save_dive(FILE *f, struct dive *dive)
                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);
+       save_cylinder_info(f, dive);
        for (i = 0; i < dive->samples; i++)
                save_sample(f, dive->sample+i);
        fprintf(f, "</dive>\n");
@@ -182,4 +192,5 @@ void save_dives(const char *filename)
        for (i = 0; i < dive_table.nr; i++)
                save_dive(f, get_dive(i));
        fprintf(f, "</dives>\n");
+       fclose(f);
 }