Fix up small details in input/output

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

diff --git a/parse-xml.c b/parse-xml.c
index 892e0fb2014fe8abe99b5e7bbc5fd3e7565dc076..ea568f74084c183ae645b11ab2227c115254d7c3 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -197,7 +197,7 @@ static void pressure(char *buffer, void *_press)
        case FLOAT:
                /* Maybe it's in Bar? */
                if (val.fp < 500.0) {
-                       pressure->mbar = val.fp * 1000;
+                       pressure->mbar = val.fp * 1000 + 0.5;
                        break;
                }
                printf("Unknown fractional pressure reading %s\n", buffer);
@@ -233,7 +233,7 @@ static void depth(char *buffer, void *_depth)
                val.fp = val.i;
                /* fallthrough */
        case FLOAT:
-               depth->mm = val.fp * 1000;
+               depth->mm = val.fp * 1000 + 0.5;
                break;
        default:
                printf("Strange depth reading %s\n", buffer);
@@ -257,7 +257,7 @@ static void temperature(char *buffer, void *_temperature)
                        break;
                /* Celsius */
                if (val.fp < 50.0) {
-                       temperature->mkelvin = (val.fp + 273.16) * 1000;
+                       temperature->mkelvin = (val.fp + 273.15) * 1000 + 0.5;
                        break;
                }
                /* Fahrenheit */
@@ -326,10 +326,17 @@ static void percent(char *buffer, void *_fraction)
 
 static void gasmix(char *buffer, void *_fraction)
 {
+       /* libdivecomputer does negative percentages. */
+       if (*buffer == '-')
+               return;
        if (gasmix_index < MAX_MIXES)
                percent(buffer, _fraction);
 }
 
+static void gasmix_nitrogen(char *buffer, void *_gasmix)
+{
+       /* Ignore n2 percentages. There's no value in them. */
+}
 
 #define MATCH(pattern, fn, dest) \
        match(pattern, strlen(pattern), name, len, fn, buf, dest)
@@ -346,6 +353,8 @@ static void try_to_fill_sample(struct sample *sample, const char *name, char *bu
                return;
        if (MATCH(".sample.depth", depth, &sample->depth))
                return;
+       if (MATCH(".sample.temp", temperature, &sample->temperature))
+               return;
        if (MATCH(".sample.temperature", temperature, &sample->temperature))
                return;
        if (MATCH(".sample.sampletime", sampletime, &sample->time))
@@ -404,7 +413,7 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 
        if (MATCH(".o2", gasmix, &dive->gasmix[gasmix_index].o2))
                return;
-       if (MATCH(".n2", gasmix, &dive->gasmix[gasmix_index].n2))
+       if (MATCH(".n2", gasmix_nitrogen, &dive->gasmix[gasmix_index]))
                return;
        if (MATCH(".he", gasmix, &dive->gasmix[gasmix_index].he))
                return;
@@ -465,12 +474,43 @@ static char *generate_name(struct dive *dive)
        return p;
 }
 
+static void sanitize_gasmix(struct dive *dive)
+{
+       int i;
+
+       for (i = 0; i < MAX_MIXES; i++) {
+               gasmix_t *mix = dive->gasmix+i;
+               unsigned int o2, he;
+
+               o2 = mix->o2.permille;
+               he = mix->he.permille;
+
+               /* Regular air: leave empty */
+               if (!he) {
+                       if (!o2)
+                               continue;
+                       /* 20.9% or 21% O2 is just air */
+                       if (o2 >= 209 && o2 <= 210) {
+                               mix->o2.permille = 0;
+                               continue;
+                       }
+               }
+
+               /* Sane mix? */
+               if (o2 <= 1000 && he <= 1000 && o2+he <= 1000)
+                       continue;
+               fprintf(stderr, "Odd gasmix: %d O2 %d He\n", o2, he);
+               memset(mix, 0, sizeof(*mix));
+       }
+}
+
 static void dive_end(void)
 {
        if (!dive)
                return;
        if (!dive->name)
                dive->name = generate_name(dive);
+       sanitize_gasmix(dive);
        record_dive(dive);
        dive = NULL;
        gasmix_index = 0;