Start handling dive events

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

diff --git a/parse-xml.c b/parse-xml.c
index 24acb1c1cc9f7f003e490de5c732b503d6b20866..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,
@@ -422,7 +428,7 @@ static void water_pressure(char *buffer, void *_depth)
                 * atm to cm. Why not mm? The precision just isn't
                 * there.
                 */
-               cm = 100 * (atm - 1) + 0.5;
+               cm = 100 * atm + 0.5;
                if (cm > 0) {
                        depth->mm = 10 * (long)cm;
                        break;
@@ -521,7 +527,7 @@ static void fahrenheit(char *buffer, void *_temperature)
  * pressures are in PSI. But the tank working pressure is in
  * bar. WTF^2?
  *
- * Crazy stuff like this is why diveclog has everything in
+ * Crazy stuff like this is why subsurface has everything in
  * these inconvenient typed structures, and you have to say
  * "pressure->mbar" to get the actual value. Exactly so that
  * you can never have unit confusion.
@@ -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)
 {
@@ -652,6 +684,7 @@ static int divinglog_dive_match(struct dive *dive, const char *name, int len, ch
                MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
                MATCH(".presw", pressure, &dive->cylinder[0].type.workingpressure) ||
                MATCH(".comments", utf8_string, &dive->notes) ||
+               MATCH(".buddy.names", utf8_string, &dive->buddy) ||
                MATCH(".country.name", utf8_string, &country) ||
                MATCH(".city.name", utf8_string, &city) ||
                MATCH(".place.name", divinglog_place, &dive->location) ||
@@ -881,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)
 {
@@ -949,10 +996,16 @@ 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))
                return;
+       if (MATCH(".divemaster", utf8_string, &dive->divemaster))
+               return;
+       if (MATCH(".buddy", utf8_string, &dive->buddy))
+               return;
 
        if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cylinder_index].type.size))
                return;
@@ -1116,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)
@@ -1135,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)
@@ -1155,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;
@@ -1352,14 +1412,16 @@ void parse_xml_file(const char *filename, GError **error)
                fprintf(stderr, "Failed to parse '%s'.\n", filename);
                if (error != NULL)
                {
-                       *error = g_error_new(g_quark_from_string("divelog"),
+                       *error = g_error_new(g_quark_from_string("subsurface"),
                                             DIVE_ERROR_PARSE,
                                             "Failed to parse '%s'",
                                             filename);
                }
                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));