dive_table.nr = nr+1;
}
-static void nonmatch(const char *type, const char *fullname, const char *name, char *buffer)
+static void start_match(const char *type, const char *name, char *buffer)
{
- if (verbose > 1)
- printf("Unable to match %s '(%.*s)%s' (%s)\n", type,
- (int) (name - fullname), fullname, name,
- buffer);
- free(buffer);
+ if (verbose > 2)
+ printf("Matching %s '%s' (%s)\n",
+ type, name, buffer);
}
-static const char *last_part(const char *name)
+static void nonmatch(const char *type, const char *name, char *buffer)
{
- const char *p = strrchr(name, '.');
- return p ? p+1 : name;
+ if (verbose > 1)
+ printf("Unable to match %s '%s' (%s)\n",
+ type, name, buffer);
+ free(buffer);
}
typedef void (*matchfn_t)(char *buffer, void *);
-static int match(const char *pattern, const char *name, matchfn_t fn, char *buf, void *data)
+static int match(const char *pattern, int plen,
+ const char *name, int nlen,
+ matchfn_t fn, char *buf, void *data)
{
- if (strcasecmp(pattern, name))
+ if (plen > nlen)
+ return 0;
+ if (memcmp(pattern, name + nlen - plen, plen))
return 0;
fn(buf, data);
return 1;
static struct dive *dive;
static struct sample *sample;
static struct tm tm;
+static int suunto;
+static int event_index, gasmix_index;
static time_t utc_mktime(struct tm *tm)
{
case FLOAT:
/* Maybe it's in Bar? */
if (val.fp < 500.0) {
- pressure->mbar = val.fp * 1000;
+ pressure->mbar = val.fp * 1000 + 0.5;
break;
}
printf("Unknown fractional pressure reading %s\n", buffer);
val.fp = val.i;
/* fallthrough */
case FLOAT:
- depth->mm = val.fp * 1000;
+ depth->mm = val.fp * 1000 + 0.5;
break;
default:
printf("Strange depth reading %s\n", buffer);
break;
/* Celsius */
if (val.fp < 50.0) {
- temperature->mkelvin = (val.fp + 273.16) * 1000;
+ temperature->mkelvin = (val.fp + 273.15) * 1000 + 0.5;
break;
}
/* Fahrenheit */
sampletime(buffer, _time);
}
-static void ignore(char *buffer, void *_time)
+static void percent(char *buffer, void *_fraction)
+{
+ fraction_t *fraction = _fraction;
+ 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:
+ if (val.fp <= 100.0)
+ fraction->permille = val.fp * 10 + 0.5;
+ break;
+
+ default:
+ printf("Strange percentage reading %s\n", buffer);
+ break;
+ }
+ free(buffer);
+}
+
+static void gasmix(char *buffer, void *_fraction)
+{
+ /* libdivecomputer does negative percentages. */
+ if (*buffer == '-')
+ return;
+ if (gasmix_index < MAX_MIXES)
+ percent(buffer, _fraction);
+}
+
+static void gasmix_nitrogen(char *buffer, void *_gasmix)
{
+ /* Ignore n2 percentages. There's no value in them. */
}
+#define MATCH(pattern, fn, dest) \
+ match(pattern, strlen(pattern), name, len, fn, buf, dest)
+
/* 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);
+ int len = strlen(name);
- if (match("pressure", last, pressure, buf, &sample->tankpressure))
+ start_match("sample", name, buf);
+ if (MATCH(".sample.pressure", pressure, &sample->tankpressure))
return;
- if (match("cylpress", last, pressure, buf, &sample->tankpressure))
+ if (MATCH(".sample.cylpress", pressure, &sample->tankpressure))
return;
- if (match("depth", last, depth, buf, &sample->depth))
+ if (MATCH(".sample.depth", depth, &sample->depth))
return;
- if (match("temperature", last, temperature, buf, &sample->temperature))
+ if (MATCH(".sample.temp", temperature, &sample->temperature))
return;
- if (match("sampletime", last, sampletime, buf, &sample->time))
+ if (MATCH(".sample.temperature", temperature, &sample->temperature))
return;
- if (match("time", last, sampletime, buf, &sample->time))
+ if (MATCH(".sample.sampletime", sampletime, &sample->time))
+ return;
+ if (MATCH(".sample.time", sampletime, &sample->time))
return;
- nonmatch("sample", name, last, buf);
+ nonmatch("sample", name, buf);
+}
+
+/*
+ * Crazy suunto xml. Look at how those o2/he things match up.
+ */
+static int suunto_dive_match(struct dive *dive, const char *name, int len, char *buf)
+{
+ return MATCH(".o2pct", percent, &dive->gasmix[0].o2) ||
+ MATCH(".hepct_0", percent, &dive->gasmix[0].he) ||
+ MATCH(".o2pct_2", percent, &dive->gasmix[1].o2) ||
+ MATCH(".hepct_1", percent, &dive->gasmix[1].he) ||
+ MATCH(".o2pct_3", percent, &dive->gasmix[2].o2) ||
+ MATCH(".hepct_2", percent, &dive->gasmix[2].he) ||
+ MATCH(".o2pct_4", percent, &dive->gasmix[3].o2) ||
+ MATCH(".hepct_3", percent, &dive->gasmix[3].he);
}
/* 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)
{
- const char *last = last_part(name);
+ int len = strlen(name);
- if (match("date", last, divedate, buf, &dive->when))
- return;
- if (match("time", last, divetime, buf, &dive->when))
+ start_match("dive", name, buf);
+ if (MATCH(".date", divedate, &dive->when))
return;
- if (match("datetime", last, divedatetime, buf, &dive->when))
+ if (MATCH(".time", divetime, &dive->when))
return;
- if (match("maxdepth", last, depth, buf, &dive->maxdepth))
+ if (MATCH(".datetime", divedatetime, &dive->when))
return;
- if (match("meandepth", last, depth, buf, &dive->meandepth))
+ if (MATCH(".maxdepth", depth, &dive->maxdepth))
return;
- if (match("divetime", last, duration, buf, &dive->duration))
+ if (MATCH(".meandepth", depth, &dive->meandepth))
return;
- if (match("divetimesec", last, duration, buf, &dive->duration))
+ if (MATCH(".divetime", duration, &dive->duration))
return;
- if (match("surfacetime", last, duration, buf, &dive->surfacetime))
+ if (MATCH(".divetimesec", duration, &dive->duration))
return;
- if (match("airtemp", last, temperature, buf, &dive->airtemp))
+ if (MATCH(".surfacetime", duration, &dive->surfacetime))
return;
- if (match("watertemp", last, temperature, buf, &dive->watertemp))
+ if (MATCH(".airtemp", temperature, &dive->airtemp))
return;
- if (match("cylinderstartpressure", last, pressure, buf, &dive->beginning_pressure))
+ if (MATCH(".watertemp", temperature, &dive->watertemp))
return;
- if (match("cylinderendpressure", last, pressure, buf, &dive->end_pressure))
+ if (MATCH(".cylinderstartpressure", pressure, &dive->beginning_pressure))
return;
- if (match("divenumber", last, ignore, buf, NULL))
+ if (MATCH(".cylinderendpressure", pressure, &dive->end_pressure))
return;
- if (match("diveseries", last, ignore, buf, NULL))
+
+ if (MATCH(".o2", gasmix, &dive->gasmix[gasmix_index].o2))
return;
- if (match("number", last, ignore, buf, NULL))
+ if (MATCH(".n2", gasmix_nitrogen, &dive->gasmix[gasmix_index]))
return;
- if (match("size", last, ignore, buf, NULL))
+ if (MATCH(".he", gasmix, &dive->gasmix[gasmix_index].he))
return;
- if (match("fingerprint", last, ignore, buf, NULL))
+
+ /* Suunto XML files are some crazy sh*t. */
+ if (suunto && suunto_dive_match(dive, name, len, buf))
return;
- nonmatch("dive", name, last, buf);
+
+ nonmatch("dive", name, buf);
}
static unsigned int dive_size(int samples)
return p;
}
+static void sanitize_gasmix(struct dive *dive)
+{
+ int i;
+
+ for (i = 0; i < MAX_MIXES; i++) {
+ gasmix_t *mix = dive->gasmix+i;
+ unsigned int o2, he;
+
+ o2 = mix->o2.permille;
+ he = mix->he.permille;
+
+ /* Regular air: leave empty */
+ if (!he) {
+ if (!o2)
+ continue;
+ /* 20.9% or 21% O2 is just air */
+ if (o2 >= 209 && o2 <= 210) {
+ mix->o2.permille = 0;
+ continue;
+ }
+ }
+
+ /* Sane mix? */
+ if (o2 <= 1000 && he <= 1000 && o2+he <= 1000)
+ continue;
+ fprintf(stderr, "Odd gasmix: %d O2 %d He\n", o2, he);
+ memset(mix, 0, sizeof(*mix));
+ }
+}
+
static void dive_end(void)
{
if (!dive)
return;
if (!dive->name)
dive->name = generate_name(dive);
+ sanitize_gasmix(dive);
record_dive(dive);
dive = NULL;
+ gasmix_index = 0;
+}
+
+static void suunto_start(void)
+{
+ suunto++;
+}
+
+static void suunto_end(void)
+{
+ suunto--;
+}
+
+static void event_start(void)
+{
+}
+
+static void event_end(void)
+{
+ event_index++;
+}
+
+static void gasmix_start(void)
+{
+}
+
+static void gasmix_end(void)
+{
+ gasmix_index++;
}
static void sample_start(void)
}
sample = dive->sample + nr;
memset(sample, 0, sizeof(*sample));
+ event_index = 0;
}
static void sample_end(void)
entry(name, len, content);
}
-static void traverse(xmlNode *node)
+static void traverse(xmlNode *root);
+
+static void traverse_properties(xmlNode *node)
+{
+ xmlAttr *p;
+
+ for (p = node->properties; p; p = p->next)
+ traverse(p->children);
+}
+
+static void visit(xmlNode *n)
+{
+ visit_one_node(n);
+ traverse_properties(n);
+ traverse(n->children);
+}
+
+/*
+ * I'm sure this could be done as some fancy DTD rules.
+ * It's just not worth the headache.
+ */
+static struct nesting {
+ const char *name;
+ void (*start)(void), (*end)(void);
+} nesting[] = {
+ { "dive", dive_start, dive_end },
+ { "SUUNTO", suunto_start, suunto_end },
+ { "sample", sample_start, sample_end },
+ { "SAMPLE", sample_start, sample_end },
+ { "event", event_start, event_end },
+ { "gasmix", gasmix_start, gasmix_end },
+ { NULL, }
+};
+
+static void traverse(xmlNode *root)
{
xmlNode *n;
- for (n = node; n; n = n->next) {
- /* XML from libdivecomputer: 'dive' per new dive */
- if (!strcmp(n->name, "dive")) {
- dive_start();
- traverse(n->children);
- dive_end();
- continue;
- }
+ for (n = root; n; n = n->next) {
+ struct nesting *rule = nesting;
- /*
- * At least both libdivecomputer and Suunto
- * agree on "sample".
- *
- * Well - almost. Ignore case.
- */
- if (!strcasecmp(n->name, "sample")) {
- sample_start();
- traverse(n->children);
- sample_end();
- continue;
- }
+ do {
+ if (!strcmp(rule->name, n->name))
+ break;
+ rule++;
+ } while (rule->name);
- /* Anything else - just visit it and recurse */
- visit_one_node(n);
- traverse(n->children);
+ if (rule->start)
+ rule->start();
+ visit(n);
+ if (rule->end)
+ rule->end();
}
}
projects / ext / subsurface.git / blobdiff