Save and parse notes and locations

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

diff --git a/parse-xml.c b/parse-xml.c
index ea568f74084c183ae645b11ab2227c115254d7c3..86ef31ade91369ba0a1f3750acf03e49097dbaee 100644 (file)
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -106,14 +106,25 @@ static void divedate(char *buffer, void *_when)
 {
        int d,m,y;
        time_t *when = _when;
+       int success = 0;
 
+       success = tm.tm_sec | tm.tm_min | tm.tm_hour;
        if (sscanf(buffer, "%d.%d.%d", &d, &m, &y) == 3) {
                tm.tm_year = y;
                tm.tm_mon = m-1;
                tm.tm_mday = d;
-               if (tm.tm_sec | tm.tm_min | tm.tm_hour)
-                       *when = utc_mktime(&tm);
+       } else if (sscanf(buffer, "%d-%d-%d", &y, &m, &d) == 3) {
+               tm.tm_year = y;
+               tm.tm_mon = m-1;
+               tm.tm_mday = d;
+       } else {
+               fprintf(stderr, "Unable to parse date '%s'\n", buffer);
+               success = 0;
        }
+
+       if (success)
+               *when = utc_mktime(&tm);
+
        free(buffer);
 }
 
@@ -338,6 +349,11 @@ static void gasmix_nitrogen(char *buffer, void *_gasmix)
        /* Ignore n2 percentages. There's no value in them. */
 }
 
+static void utf8_string(char *buffer, void *_res)
+{
+       *(char **)_res = buffer;
+}
+
 #define MATCH(pattern, fn, dest) \
        match(pattern, strlen(pattern), name, len, fn, buf, dest)
 
@@ -396,6 +412,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
                return;
        if (MATCH(".meandepth", depth, &dive->meandepth))
                return;
+       if (MATCH(".duration", duration, &dive->duration))
+               return;
        if (MATCH(".divetime", duration, &dive->duration))
                return;
        if (MATCH(".divetimesec", duration, &dive->duration))
@@ -410,6 +428,10 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
                return;
        if (MATCH(".cylinderendpressure", pressure, &dive->end_pressure))
                return;
+       if (MATCH(".location", utf8_string, &dive->location))
+               return;
+       if (MATCH(".notes", utf8_string, &dive->notes))
+               return;
 
        if (MATCH(".o2", gasmix, &dive->gasmix[gasmix_index].o2))
                return;