Start handling dive events

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

diff --git a/parse-xml.c b/parse-xml.c
index 6bb78fdf6077e1db2a85ee6ee194e5793c8ae802..e6472735dcdd40ca91bf69daebcb035ac7ed9be7 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -92,8 +92,14 @@ const struct units IMPERIAL_units = {
  */
 static struct dive *dive;
 static struct sample *sample;
+static struct {
+       int active;
+       duration_t time;
+       int type, flags, value;
+       const char *name;
+} event;
 static struct tm tm;
-static int event_index, cylinder_index;
+static int cylinder_index;
 
 static enum import_source {
        UNKNOWN,
@@ -558,6 +564,32 @@ static int uddf_fill_sample(struct sample *sample, const char *name, int len, ch
                0;
 }
 
+static void eventtime(char *buffer, void *_duration)
+{
+       duration_t *duration = _duration;
+       sampletime(buffer, duration);
+       if (sample)
+               duration->seconds += sample->time.seconds;
+}
+
+static void try_to_fill_event(const char *name, char *buf)
+{
+       int len = strlen(name);
+
+       start_match("event", name, buf);
+       if (MATCH(".event", utf8_string, &event.name))
+               return;
+       if (MATCH(".name", utf8_string, &event.name))
+               return;
+       if (MATCH(".time", eventtime, &event.time))
+               return;
+       if (MATCH(".type", get_index, &event.type))
+               return;
+       if (MATCH(".flags", get_index, &event.flags))
+               return;
+       nonmatch("event", name, buf);
+}
+
 /* We're in samples - try to convert the random xml value to something useful */
 static void try_to_fill_sample(struct sample *sample, const char *name, char *buf)
 {
@@ -882,6 +914,20 @@ static int uddf_dive_match(struct dive *dive, const char *name, int len, char *b
                0;
 }
 
+static void gps_location(char *buffer, void *_dive)
+{
+       int i;
+       struct dive *dive = _dive;
+       double latitude, longitude;
+
+       i = sscanf(buffer, "%lf %lf", &latitude, &longitude);
+       if (i == 2) {
+               dive->latitude = latitude;
+               dive->longitude = longitude;
+       }
+       free(buffer);
+}
+
 /* We're in the top-level dive xml. Try to convert whatever value to a dive value */
 static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 {
@@ -950,6 +996,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
                return;
        if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))
                return;
+       if (MATCH(".gps", gps_location, dive))
+               return;
        if (MATCH(".location", utf8_string, &dive->location))
                return;
        if (MATCH(".notes", utf8_string, &dive->notes))
@@ -1121,11 +1169,15 @@ static void dive_end(void)
 
 static void event_start(void)
 {
+       memset(&event, 0, sizeof(event));
+       event.active = 1;
 }
 
 static void event_end(void)
 {
-       event_index++;
+       if (event.name)
+               add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name);
+       event.active = 0;
 }
 
 static void cylinder_start(void)
@@ -1140,7 +1192,6 @@ static void cylinder_end(void)
 static void sample_start(void)
 {
        sample = prepare_sample(&dive);
-       event_index = 0;
 }
 
 static void sample_end(void)
@@ -1160,6 +1211,10 @@ static void entry(const char *name, int size, const char *raw)
                return;
        memcpy(buf, raw, size);
        buf[size] = 0;
+       if (event.active) {
+               try_to_fill_event(name, buf);
+               return;
+       }
        if (sample) {
                try_to_fill_sample(sample, name, buf);
                return;
@@ -1364,7 +1419,9 @@ void parse_xml_file(const char *filename, GError **error)
                }
                return;
        }
-
+       /* 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(filename);
        reset_all();
        dive_start();
        traverse(xmlDocGetRootElement(doc));