Fix profile and average depth for freedives

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

diff --git a/parse-xml.c b/parse-xml.c
index 552786b7aa58e3f780e08ce45bd87e80f1cfbbcf..5159a334f9153f65b010f0e1cf5c4845cebcf530 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -39,6 +39,45 @@ void record_dive(struct dive *dive)
        dive_table.nr = nr+1;
 }
 
+void record_trip(struct dive *trip)
+{
+       dive_trip_list = insert_trip(trip, dive_trip_list);
+}
+
+static void delete_dive_renumber(struct dive **dives, int i, int nr)
+{
+       struct dive *dive = dives[i];
+       int number = dive->number, j;
+
+       if (!number)
+               return;
+
+       /*
+        * Check that all numbered dives after the deleted
+        * ones are consecutive, return without renumbering
+        * if that is not the case.
+        */
+       for (j = i+1; j < nr; j++) {
+               struct dive *next = dives[j];
+               if (!next->number)
+                       break;
+               number++;
+               if (next->number != number)
+                       return;
+       }
+
+       /*
+        * Ok, we hit the end of the dives or a unnumbered
+        * dive - renumber.
+        */
+       for (j = i+1 ; j < nr; j++) {
+               struct dive *next = dives[j];
+               if (!next->number)
+                       break;
+               next->number--;
+       }
+}
+
 /*
  * Remove a dive from the dive_table array
  */
@@ -55,6 +94,8 @@ void delete_dive(struct dive *dive)
                struct dive *d = dives[i];
                if (d != dive)
                        continue;
+               /* should we re-number? */
+               delete_dive_renumber(dives, i, nr);
                memmove(dives+i, dives+i+1, sizeof(struct dive *)*(nr-i-1));
                dives[nr] = NULL;
                dive_table.nr = nr-1;
@@ -120,7 +161,7 @@ const struct units IMPERIAL_units = {
 /*
  * Dive info as it is being built up..
  */
-static struct dive *cur_dive;
+static struct dive *cur_dive, *cur_trip = NULL;
 static struct sample *cur_sample;
 static struct {
        int active;
@@ -499,6 +540,17 @@ static void get_index(char *buffer, void *_i)
        free(buffer);
 }
 
+static void get_tripflag(char *buffer, void *_tf)
+{
+       tripflag_t *tf = _tf;
+       tripflag_t i;
+
+       *tf = TF_NONE;
+       for (i = NO_TRIP; i < NUM_TRIPFLAGS; i++)
+               if(! strcmp(buffer, tripflag_names[i]))
+                       *tf = i;
+}
+
 static void centibar(char *buffer, void *_pressure)
 {
        pressure_t *pressure = _pressure;
@@ -611,6 +663,7 @@ static int uddf_fill_sample(struct sample *sample, const char *name, int len, ch
        return  MATCH(".divetime", sampletime, &sample->time) ||
                MATCH(".depth", depth, &sample->depth) ||
                MATCH(".temperature", temperature, &sample->temperature) ||
+               MATCH(".tankpressure", pressure, &sample->cylinderpressure) ||
                0;
 }
 
@@ -1025,6 +1078,8 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
 
        if (MATCH(".number", get_index, &dive->number))
                return;
+       if (MATCH(".tripflag", get_tripflag, &dive->tripflag))
+               return;
        if (MATCH(".date", divedate, &dive->when))
                return;
        if (MATCH(".time", divetime, &dive->when))
@@ -1063,6 +1118,10 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
                return;
        if (MATCH(".location", utf8_string, &dive->location))
                return;
+       if (MATCH(".suit", utf8_string, &dive->suit))
+               return;
+       if (MATCH(".divesuit", utf8_string, &dive->suit))
+               return;
        if (MATCH(".notes", utf8_string, &dive->notes))
                return;
        if (MATCH(".divemaster", utf8_string, &dive->divemaster))
@@ -1097,6 +1156,27 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
        nonmatch("dive", name, buf);
 }
 
+/* We're in the top-level trip xml. Try to convert whatever value to a trip value */
+static void try_to_fill_trip(struct dive **divep, const char *name, char *buf)
+{
+       int len = strlen(name);
+
+       start_match("trip", name, buf);
+
+       struct dive *dive = *divep;
+
+       if (MATCH(".date", divedate, &dive->when)) {
+               dive->when = utc_mktime(&cur_tm);
+               return;
+       }
+       if (MATCH(".location", utf8_string, &dive->location))
+               return;
+       if (MATCH(".notes", utf8_string, &dive->notes))
+               return;
+
+       nonmatch("trip", name, buf);
+}
+
 /*
  * File boundaries are dive boundaries. But sometimes there are
  * multiple dives per file, so there can be other events too that
@@ -1121,6 +1201,22 @@ static void dive_end(void)
        cur_ws_index = 0;
 }
 
+static void trip_start(void)
+{
+       if (cur_trip)
+               return;
+       cur_trip = alloc_dive();
+       memset(&cur_tm, 0, sizeof(cur_tm));
+}
+
+static void trip_end(void)
+{
+       if (!cur_trip)
+               return;
+       record_trip(cur_trip);
+       cur_trip = NULL;
+}
+
 static void event_start(void)
 {
        memset(&cur_event, 0, sizeof(cur_event));
@@ -1184,6 +1280,10 @@ static void entry(const char *name, int size, const char *raw)
                try_to_fill_sample(cur_sample, name, buf);
                return;
        }
+       if (cur_trip) {
+               try_to_fill_trip(&cur_trip, name, buf);
+               return;
+       }
        if (cur_dive) {
                try_to_fill_dive(&cur_dive, name, buf);
                return;
@@ -1309,6 +1409,7 @@ static struct nesting {
 } nesting[] = {
        { "dive", dive_start, dive_end },
        { "Dive", dive_start, dive_end },
+       { "trip", trip_start, trip_end },
        { "sample", sample_start, sample_end },
        { "waypoint", sample_start, sample_end },
        { "SAMPLE", sample_start, sample_end },
@@ -1379,8 +1480,8 @@ void parse_xml_buffer(const char *url, const char *buffer, int size, GError **er
                }
                return;
        }
-       /* we assume that the last (or only) filename passed as argument is a 
-        * great filename to use as default when saving the dives */ 
+       /* we assume that the last (or only) filename passed as argument is a
+        * great filename to use as default when saving the dives */
        set_filename(url);
        reset_all();
        dive_start();
@@ -1426,7 +1527,11 @@ static xsltStylesheetPtr try_get_stylesheet(const char *path, int len, const cha
 
 static xsltStylesheetPtr get_stylesheet(const char *name)
 {
-       const char *path = xslt_path, *next;
+       const char *path, *next;
+
+       path = getenv("SUBSURFACE_XSLT_PATH");
+       if (!path)
+               path = xslt_path;
 
        do {
                int len;