Add 'datetime' parsing for libdivecomputer xml files

[ext/subsurface.git] / parse.c

diff --git a/parse.c b/parse.c
index 4f7ba64980e0cc54e50391ba3aabda289c656ad9..25d4a99370a55889ceae18c7ed3af6efa86cf73c 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -83,6 +83,23 @@ typedef struct {
        pressure_t pressure;
 } tank_type_t;
 
+static int to_feet(depth_t depth)
+{
+       return depth.mm * 0.00328084 + 0.5;
+}
+
+static int to_C(temperature_t temp)
+{
+       if (!temp.mkelvin)
+               return 0;
+       return (temp.mkelvin - 273150) / 1000;
+}
+
+static int to_PSI(pressure_t pressure)
+{
+       return pressure.mbar * 0.0145037738 + 0.5;
+}
+
 struct sample {
        duration_t time;
        depth_t depth;
@@ -104,6 +121,7 @@ struct dive {
 
 static void record_dive(struct dive *dive)
 {
+       int i;
        static int nr;
        struct tm *tm;
 
@@ -113,6 +131,16 @@ static void record_dive(struct dive *dive)
                ++nr, dive->samples,
                tm->tm_hour, tm->tm_min, tm->tm_sec,
                tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+       for (i = 0; i < dive->samples; i++) {
+               struct sample *s = dive->sample + i;
+
+               printf("%4d:%02d: %3d ft, %2d C, %4d PSI\n",
+                       s->time.seconds / 60,
+                       s->time.seconds % 60,
+                       to_feet(s->depth),
+                       to_C(s->temperature),
+                       to_PSI(s->tankpressure));
+       }
 }
 
 static void nonmatch(const char *type, const char *fullname, const char *name, char *buffer)
@@ -157,6 +185,7 @@ static time_t utc_mktime(struct tm *tm)
        int month = tm->tm_mon;
        int day = tm->tm_mday;
 
+       /* First normalize relative to 1900 */
        if (year < 70)
                year += 100;
        else if (year > 1900)
@@ -207,6 +236,26 @@ static void divetime(char *buffer, void *_when)
        free(buffer);
 }
 
+/* Libdivecomputer: "2011-03-20 10:22:38" */
+static void divedatetime(char *buffer, void *_when)
+{
+       int y,m,d;
+       int hr,min,sec;
+       time_t *when = _when;
+
+       if (sscanf(buffer, "%d-%d-%d %d:%d:%d",
+               &y, &m, &d, &hr, &min, &sec) == 6) {
+               tm.tm_year = y;
+               tm.tm_mon = m-1;
+               tm.tm_mday = d;
+               tm.tm_hour = hr;
+               tm.tm_min = min;
+               tm.tm_sec = sec;
+               *when = utc_mktime(&tm);
+       }
+       free(buffer);
+}
+
 union int_or_float {
        long i;
        double fp;
@@ -338,9 +387,8 @@ static void sampletime(char *buffer, void *_time)
        union int_or_float val;
 
        switch (integer_or_float(buffer, &val)) {
-       /* C or F? Who knows? Let's default to Celsius */
        case INTEGER:
-               time->seconds = val.i * 1000;
+               time->seconds = val.i;
                break;
        default:
                printf("Strange sample time reading %s\n", buffer);
@@ -378,6 +426,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
                return;
        if (match("time", last, divetime, buf, &dive->when))
                return;
+       if (match("datetime", last, divedatetime, buf, &dive->when))
+               return;
        nonmatch("dive", name, last, buf);
 }