]> git.tdb.fi Git - ext/subsurface.git/blobdiff - parse.c
Start moving some of the non-parsing stuff out of 'parse.c'
[ext/subsurface.git] / parse.c
diff --git a/parse.c b/parse.c
index 414d279284f12bdfd355e0a354afdd48c27ffc74..1a8e3ba6113064fb71a8273483941678f814df8c 100644 (file)
--- a/parse.c
+++ b/parse.c
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
+#include <errno.h>
 #include <time.h>
 #include <libxml/parser.h>
 #include <libxml/tree.h>
 
-/*
- * Some silly typedefs to make our units very explicit.
- *
- * Also, the units are chosen so that values can be expressible as
- * integers, so that we never have FP rounding issues. And they
- * are small enough that converting to/from imperial units doesn't
- * really matter.
- *
- * We also strive to make '0' a meaningless number saying "not
- * initialized", since many values are things that may not have
- * been reported (eg tank pressure or temperature from dive
- * computers that don't support them). But sometimes -1 is an even
- * more explicit way of saying "not there".
- *
- * Thus "millibar" for pressure, for example, or "millikelvin" for
- * temperatures. Doing temperatures in celsius or fahrenheit would
- * make for loss of precision when converting from one to the other,
- * and using millikelvin is SI-like but also means that a temperature
- * of '0' is clearly just a missing temperature or tank pressure.
- *
- * Also strive to use units that can not possibly be mistaken for a
- * valid value in a "normal" system without conversion. If the max
- * depth of a dive is '20000', you probably didn't convert from mm on
- * output, or if the max depth gets reported as "0.2ft" it was either
- * a really boring dive, or there was some missing input conversion,
- * and a 60-ft dive got recorded as 60mm.
- *
- * Doing these as "structs containing value" means that we always
- * have to explicitly write out those units in order to get at the
- * actual value. So there is hopefully little fear of using a value
- * in millikelvin as Fahrenheit by mistake.
- *
- * We don't actually use these all yet, so maybe they'll change, but
- * I made a number of types as guidelines.
- */
-typedef struct {
-       int seconds;
-} duration_t;
-
-typedef struct {
-       int mm;
-} depth_t;
-
-typedef struct {
-       int mbar;
-} pressure_t;
-
-typedef struct {
-       int mkelvin;
-} temperature_t;
-
-typedef struct {
-       int mliter;
-} volume_t;
-
-typedef struct {
-       int permille;
-} fraction_t;
-
-typedef struct {
-       int grams;
-} weight_t;
-
-typedef struct {
-       fraction_t o2;
-       fraction_t n2;
-       fraction_t he2;
-} gasmix_t;
-
-typedef struct {
-       volume_t size;
-       pressure_t pressure;
-} tank_type_t;
-
-struct sample {
-       duration_t time;
-       depth_t depth;
-       temperature_t temperature;
-       pressure_t tankpressure;
-       int tankindex;
-};
+#include "dive.h"
 
-struct dive {
-       time_t when;
-       depth_t maxdepth, meandepth;
-       duration_t duration, surfacetime;
-       depth_t visibility;
-       temperature_t airtemp, watertemp;
-       pressure_t beginning_pressure, end_pressure;
-       int samples;
-       struct sample sample[];
-};
+int verbose;
+
+struct dive_table dive_table;
 
+/*
+ * Add a dive into the dive_table array
+ */
 static void record_dive(struct dive *dive)
 {
-       static int nr;
-       struct tm *tm;
-
-       tm = gmtime(&dive->when);
-
-       printf("Dive %d with %d samples at %02d:%02d:%02d %04d-%02d-%02d\n",
-               ++nr, dive->samples,
-               tm->tm_hour, tm->tm_min, tm->tm_sec,
-               tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday);
+       int nr = dive_table.nr, allocated = dive_table.allocated;
+       struct dive **dives = dive_table.dives;
+
+       if (nr >= allocated) {
+               allocated = (nr + 32) * 3 / 2;
+               dives = realloc(dives, allocated * sizeof(struct dive *));
+               if (!dives)
+                       exit(1);
+               dive_table.dives = dives;
+               dive_table.allocated = allocated;
+       }
+       dives[nr] = dive;
+       dive_table.nr = nr+1;
 }
 
 static void nonmatch(const char *type, const char *fullname, const char *name, char *buffer)
 {
-       printf("Unable to match %s '(%.*s)%s' (%s)\n", type,
-               (int) (name - fullname), fullname, name,
-               buffer);
+       if (verbose > 1)
+               printf("Unable to match %s '(%.*s)%s' (%s)\n", type,
+                       (int) (name - fullname), fullname, name,
+                       buffer);
        free(buffer);
 }
 
@@ -152,6 +75,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)
@@ -202,10 +126,199 @@ 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;
+};
+
+enum number_type {
+       NEITHER,
+       INTEGER,
+       FLOAT
+};
+
+static enum number_type integer_or_float(char *buffer, union int_or_float *res)
+{
+       char *end;
+       long val;
+       double fp;
+
+       /* Integer or floating point? */
+       val = strtol(buffer, &end, 10);
+       if (val < 0 || end == buffer)
+               return NEITHER;
+
+       /* Looks like it might be floating point? */
+       if (*end == '.') {
+               errno = 0;
+               fp = strtod(buffer, &end);
+               if (!errno) {
+                       res->fp = fp;
+                       return FLOAT;
+               }
+       }
+
+       res->i = val;
+       return INTEGER;
+}
+
+static void pressure(char *buffer, void *_press)
+{
+       pressure_t *pressure = _press;
+       union int_or_float val;
+
+       switch (integer_or_float(buffer, &val)) {
+       case FLOAT:
+               /* Maybe it's in Bar? */
+               if (val.fp < 500.0) {
+                       pressure->mbar = val.fp * 1000;
+                       break;
+               }
+               printf("Unknown fractional pressure reading %s\n", buffer);
+               break;
+
+       case INTEGER:
+               /*
+                * Random integer? Maybe in PSI? Or millibar already?
+                *
+                * We assume that 5 bar is a ridiculous tank pressure,
+                * so if it's smaller than 5000, it's in PSI..
+                */
+               if (val.i < 5000) {
+                       pressure->mbar = val.i * 68.95;
+                       break;
+               }
+               pressure->mbar = val.i;
+               break;
+       default:
+               printf("Strange pressure reading %s\n", buffer);
+       }
+       free(buffer);
+}
+
+static void depth(char *buffer, void *_depth)
+{
+       depth_t *depth = _depth;
+       union int_or_float val;
+
+       switch (integer_or_float(buffer, &val)) {
+       /* Integer values are probably in feet */
+       case INTEGER:
+               depth->mm = 304.8 * val.i;
+               break;
+       /* Float? Probably meters.. */
+       case FLOAT:
+               depth->mm = val.fp * 1000;
+               break;
+       default:
+               printf("Strange depth reading %s\n", buffer);
+       }
+       free(buffer);
+}
+
+static void temperature(char *buffer, void *_temperature)
+{
+       temperature_t *temperature = _temperature;
+       union int_or_float val;
+
+       switch (integer_or_float(buffer, &val)) {
+       /* C or F? Who knows? Let's default to Celsius */
+       case INTEGER:
+               val.fp = val.i;
+               /* Fallthrough */
+       case FLOAT:
+               /* Ignore zero. It means "none" */
+               if (!val.fp)
+                       break;
+               /* Celsius */
+               if (val.fp < 50.0) {
+                       temperature->mkelvin = (val.fp + 273.16) * 1000;
+                       break;
+               }
+               /* Fahrenheit */
+               if (val.fp < 212.0) {
+                       temperature->mkelvin = (val.fp + 459.67) * 5000/9;
+                       break;
+               }
+               /* Kelvin or already millikelvin */
+               if (val.fp < 1000.0)
+                       val.fp *= 1000;
+               temperature->mkelvin = val.fp;
+               break;
+       default:
+               printf("Strange temperature reading %s\n", buffer);
+       }
+       free(buffer);
+}
+
+static void sampletime(char *buffer, void *_time)
+{
+       int i;
+       int min, sec;
+       duration_t *time = _time;
+
+       i = sscanf(buffer, "%d:%d", &min, &sec);
+       switch (i) {
+       case 1:
+               sec = min;
+               min = 0;
+       /* fallthrough */
+       case 2:
+               time->seconds = sec + min*60;
+               break;
+       default:
+               printf("Strange sample time reading %s\n", buffer);
+       }
+       free(buffer);
+}
+
+static void duration(char *buffer, void *_time)
+{
+       sampletime(buffer, _time);
+}
+
+static void ignore(char *buffer, void *_time)
+{
+}
+
 /* 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)
 {
        const char *last = last_part(name);
+
+       if (match("pressure", last, pressure, buf, &sample->tankpressure))
+               return;
+       if (match("cylpress", last, pressure, buf, &sample->tankpressure))
+               return;
+       if (match("depth", last, depth, buf, &sample->depth))
+               return;
+       if (match("temperature", last, temperature, buf, &sample->temperature))
+               return;
+       if (match("sampletime", last, sampletime, buf, &sample->time))
+               return;
+       if (match("time", last, sampletime, buf, &sample->time))
+               return;
+
        nonmatch("sample", name, last, buf);
 }
 
@@ -218,6 +331,36 @@ 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;
+       if (match("maxdepth", last, depth, buf, &dive->maxdepth))
+               return;
+       if (match("meandepth", last, depth, buf, &dive->meandepth))
+               return;
+       if (match("divetime", last, duration, buf, &dive->duration))
+               return;
+       if (match("divetimesec", last, duration, buf, &dive->duration))
+               return;
+       if (match("surfacetime", last, duration, buf, &dive->surfacetime))
+               return;
+       if (match("airtemp", last, temperature, buf, &dive->airtemp))
+               return;
+       if (match("watertemp", last, temperature, buf, &dive->watertemp))
+               return;
+       if (match("cylinderstartpressure", last, pressure, buf, &dive->beginning_pressure))
+               return;
+       if (match("cylinderendpressure", last, pressure, buf, &dive->end_pressure))
+               return;
+       if (match("divenumber", last, ignore, buf, NULL))
+               return;
+       if (match("diveseries", last, ignore, buf, NULL))
+               return;
+       if (match("number", last, ignore, buf, NULL))
+               return;
+       if (match("size", last, ignore, buf, NULL))
+               return;
+       if (match("fingerprint", last, ignore, buf, NULL))
+               return;
        nonmatch("dive", name, last, buf);
 }
 
@@ -273,6 +416,7 @@ static void sample_start(void)
                        return;
        }
        sample = dive->sample + nr;
+       memset(sample, 0, sizeof(*sample));
 }
 
 static void sample_end(void)
@@ -303,7 +447,6 @@ static void entry(const char *name, int size, const char *raw)
 
 static const char *nodename(xmlNode *node, char *buf, int len)
 {
-
        if (!node || !node->name)
                return "root";
 
@@ -395,7 +538,7 @@ static void traverse(xmlNode *node)
        }
 }
 
-static void parse(const char *filename)
+void parse_xml_file(const char *filename)
 {
        xmlDoc *doc;
 
@@ -412,13 +555,7 @@ static void parse(const char *filename)
        xmlCleanupParser();
 }
 
-int main(int argc, char **argv)
+void parse_xml_init(void)
 {
-       int i;
-
        LIBXML_TEST_VERSION
-
-       for (i = 1; i < argc; i++)
-               parse(argv[i]);
-       return 0;
 }