Libdivecomputer: start actually importing the dive data

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

diff --git a/parse-xml.c b/parse-xml.c
index 14c21972cdce96bc050606e2f65a9d0d8b49554a..24acb1c1cc9f7f003e490de5c732b503d6b20866 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -16,7 +16,7 @@ struct dive_table dive_table;
 /*
  * Add a dive into the dive_table array
  */
-static void record_dive(struct dive *dive)
+void record_dive(struct dive *dive)
 {
        int nr = dive_table.nr, allocated = dive_table.allocated;
        struct dive **dives = dive_table.dives;
@@ -90,7 +90,6 @@ const struct units IMPERIAL_units = {
 /*
  * Dive info as it is being built up..
  */
-static int alloc_samples;
 static struct dive *dive;
 static struct sample *sample;
 static struct tm tm;
@@ -105,7 +104,7 @@ static enum import_source {
        UDDF,
 } import_source;
 
-static time_t utc_mktime(struct tm *tm)
+time_t utc_mktime(struct tm *tm)
 {
        static const int mdays[] = {
            0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
@@ -488,6 +487,16 @@ static int uemis_fill_sample(struct sample *sample, const char *name, int len, c
  * Divinglog is crazy. The temperatures are in celsius. EXCEPT
  * for the sample temperatures, that are in Fahrenheit.
  * WTF?
+ *
+ * Oh, and I think Diving Log *internally* probably kept them
+ * in celsius, because I'm seeing entries like
+ *
+ *     <Temp>32.0</Temp>
+ *
+ * in there. Which is freezing, aka 0 degC. I bet the "0" is
+ * what Diving Log uses for "no temperature".
+ *
+ * So throw away crap like that.
  */
 static void fahrenheit(char *buffer, void *_temperature)
 {
@@ -496,6 +505,9 @@ static void fahrenheit(char *buffer, void *_temperature)
 
        switch (integer_or_float(buffer, &val)) {
        case FLOAT:
+               /* Floating point equality is evil, but works for small integers */
+               if (val.fp == 32.0)
+                       break;
                temperature->mkelvin = (val.fp + 459.67) * 5000/9;
                break;
        default:
@@ -639,7 +651,6 @@ static int divinglog_dive_match(struct dive *dive, const char *name, int len, ch
                MATCH(".depth", depth, &dive->maxdepth) ||
                MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
                MATCH(".presw", pressure, &dive->cylinder[0].type.workingpressure) ||
-               MATCH(".tanktype", utf8_string, &dive->cylinder[0].type.description) ||
                MATCH(".comments", utf8_string, &dive->notes) ||
                MATCH(".country.name", utf8_string, &country) ||
                MATCH(".city.name", utf8_string, &city) ||
@@ -972,21 +983,13 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
  */
 static void dive_start(void)
 {
-       unsigned int size;
-
        if (dive)
                return;
-
-       alloc_samples = 5;
-       size = dive_size(alloc_samples);
-       dive = malloc(size);
-       if (!dive)
-               exit(1);
-       memset(dive, 0, size);
+       dive = alloc_dive();
        memset(&tm, 0, sizeof(tm));
 }
 
-static void sanitize_gasmix(gasmix_t *mix)
+static void sanitize_gasmix(struct gasmix *mix)
 {
        unsigned int o2, he;
 
@@ -1017,7 +1020,8 @@ static void sanitize_gasmix(gasmix_t *mix)
  */
 static void match_standard_cylinder(cylinder_type_t *type)
 {
-       int psi, cuft, len;
+       double cuft;
+       int psi, len;
        const char *fmt;
        char buffer[20], *p;
 
@@ -1025,7 +1029,8 @@ static void match_standard_cylinder(cylinder_type_t *type)
        if (type->description)
                return;
 
-       cuft = type->size.mliter / 1000;
+       cuft = type->size.mliter / 28317.0;
+       cuft *= type->workingpressure.mbar / 1013.25;
        psi = type->workingpressure.mbar / 68.95;
 
        switch (psi) {
@@ -1033,7 +1038,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
                fmt = "LP%d";
                break;
        case 2600 ... 2700:     /* 2640 psi: LP+10% */
-               fmt = "LP%d+";
+               fmt = "LP%d";
                break;
        case 2900 ... 3100:     /* 3000 psi: ALx tank */
                fmt = "AL%d";
@@ -1047,7 +1052,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
        default:
                return;
        }
-       len = snprintf(buffer, sizeof(buffer), fmt, cuft);
+       len = snprintf(buffer, sizeof(buffer), fmt, (int) (cuft+0.5));
        p = malloc(len+1);
        if (!p)
                return;
@@ -1078,15 +1083,15 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
        if (!type->size.mliter)
                return;
 
-       /* Ok, we have both size and pressure: try to match a description */
-       match_standard_cylinder(type);
-
        if (input_units.volume == CUFT || import_source == SUUNTO) {
                volume_of_air = type->size.mliter * 28.317;     /* milli-cu ft to milliliter */
                atm = type->workingpressure.mbar / 1013.25;     /* working pressure in atm */
                volume = volume_of_air / atm;                   /* milliliters at 1 atm: "true size" */
                type->size.mliter = volume + 0.5;
        }
+
+       /* Ok, we have both size and pressure: try to match a description */
+       match_standard_cylinder(type);
 }
 
 static void sanitize_cylinder_info(struct dive *dive)
@@ -1129,22 +1134,7 @@ static void cylinder_end(void)
 
 static void sample_start(void)
 {
-       int nr;
-
-       if (!dive)
-               return;
-       nr = dive->samples;
-       if (nr >= alloc_samples) {
-               unsigned int size;
-
-               alloc_samples = (alloc_samples * 3)/2 + 10;
-               size = dive_size(alloc_samples);
-               dive = realloc(dive, size);
-               if (!dive)
-                       return;
-       }
-       sample = dive->sample + nr;
-       memset(sample, 0, sizeof(*sample));
+       sample = prepare_sample(&dive);
        event_index = 0;
 }
 
@@ -1153,8 +1143,8 @@ static void sample_end(void)
        if (!dive)
                return;
 
+       finish_sample(dive, sample);
        sample = NULL;
-       dive->samples++;
 }
 
 static void entry(const char *name, int size, const char *raw)