From: Linus Torvalds Date: Thu, 1 Sep 2011 17:09:53 +0000 (-0700) Subject: Rename some files to be more appropriate X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=4350a75b9455387c0da36b9b52349a858d8fca9c;p=ext%2Fsubsurface.git Rename some files to be more appropriate The executable is now called 'divelog'. If this gets useful enough to actually *use*, I guess I'll have to come up with a real name some day. Add a silly README, rename 'parse' to 'parse-xml'. Signed-off-by: Linus Torvalds --- diff --git a/Makefile b/Makefile index 5bb40c2..4a86ebf 100644 --- a/Makefile +++ b/Makefile @@ -1,14 +1,15 @@ CC=gcc CFLAGS=-Wall -Wno-pointer-sign -g -OBJS=main.o profile.o info.o divelist.o parse.o +OBJS=main.o profile.o info.o divelist.o parse-xml.o -parse: $(OBJS) - $(CC) $(LDLAGS) -o parse $(OBJS) `xml2-config --libs` \ +divelog: $(OBJS) + $(CC) $(LDLAGS) -o divelog $(OBJS) \ + `xml2-config --libs` \ `pkg-config --libs gtk+-2.0` -parse.o: parse.c dive.h - $(CC) $(CFLAGS) -c `xml2-config --cflags` parse.c +parse-xml.o: parse-xml.c dive.h + $(CC) $(CFLAGS) -c `xml2-config --cflags` parse-xml.c main.o: main.c dive.h display.h $(CC) $(CFLAGS) `pkg-config --cflags gtk+-2.0` -c main.c diff --git a/README b/README new file mode 100644 index 0000000..946beff --- /dev/null +++ b/README @@ -0,0 +1,5 @@ +Half-arsed divelog software in C. + +I'm tired of java programs that don't work etc. + +License: GPLv2 diff --git a/parse-xml.c b/parse-xml.c new file mode 100644 index 0000000..58d446d --- /dev/null +++ b/parse-xml.c @@ -0,0 +1,593 @@ +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dive.h" + +int verbose; + +struct dive_table dive_table; + +/* + * Add a dive into the dive_table array + */ +static void record_dive(struct dive *dive) +{ + 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) +{ + if (verbose > 1) + printf("Unable to match %s '(%.*s)%s' (%s)\n", type, + (int) (name - fullname), fullname, name, + buffer); + free(buffer); +} + +static const char *last_part(const char *name) +{ + const char *p = strrchr(name, '.'); + return p ? p+1 : name; +} + +typedef void (*matchfn_t)(char *buffer, void *); + +static int match(const char *pattern, const char *name, matchfn_t fn, char *buf, void *data) +{ + if (strcasecmp(pattern, name)) + return 0; + fn(buf, data); + return 1; +} + +/* + * Dive info as it is being built up.. + */ +static int alloc_samples; +static struct dive *dive; +static struct sample *sample; +static struct tm tm; + +static time_t utc_mktime(struct tm *tm) +{ + static const int mdays[] = { + 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 + }; + int year = tm->tm_year; + int month = tm->tm_mon; + int day = tm->tm_mday; + + /* First normalize relative to 1900 */ + if (year < 70) + year += 100; + else if (year > 1900) + year -= 1900; + + /* Normalized to Jan 1, 1970: unix time */ + year -= 70; + + if (year < 0 || year > 129) /* algo only works for 1970-2099 */ + return -1; + if (month < 0 || month > 11) /* array bounds */ + return -1; + if (month < 2 || (year + 2) % 4) + day--; + if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_sec < 0) + return -1; + return (year * 365 + (year + 1) / 4 + mdays[month] + day) * 24*60*60UL + + tm->tm_hour * 60*60 + tm->tm_min * 60 + tm->tm_sec; +} + +static void divedate(char *buffer, void *_when) +{ + int d,m,y; + time_t *when = _when; + + 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); + } + free(buffer); +} + +static void divetime(char *buffer, void *_when) +{ + int h,m,s = 0; + time_t *when = _when; + + if (sscanf(buffer, "%d:%d:%d", &h, &m, &s) >= 2) { + tm.tm_hour = h; + tm.tm_min = m; + tm.tm_sec = s; + if (tm.tm_year) + *when = utc_mktime(&tm); + } + 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)) { + /* All values are probably in meters */ + case INTEGER: + val.fp = val.i; + /* fallthrough */ + 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); +} + +/* 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); + + if (match("date", last, divedate, buf, &dive->when)) + 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); +} + +static unsigned int dive_size(int samples) +{ + return sizeof(struct dive) + samples*sizeof(struct sample); +} + +/* + * File boundaries are dive boundaries. But sometimes there are + * multiple dives per file, so there can be other events too that + * trigger a "new dive" marker and you may get some nesting due + * to that. Just ignore nesting levels. + */ +static void dive_start(void) +{ + unsigned int size; + + if (dive) + return; + + alloc_samples = 5; + size = dive_size(alloc_samples); + dive = malloc(size); + if (!dive) + exit(1); + memset(dive, 0, size); + memset(&tm, 0, sizeof(tm)); +} + +static char *generate_name(struct dive *dive) +{ + int len; + struct tm *tm; + char buffer[256], *p; + + tm = gmtime(&dive->when); + + len = snprintf(buffer, sizeof(buffer), + "%04d-%02d-%02d " + "%02d:%02d:%02d " + "(%d ft, %d min)", + tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, + tm->tm_hour, tm->tm_min, tm->tm_sec, + to_feet(dive->maxdepth), dive->duration.seconds / 60); + p = malloc(len+1); + if (!p) + exit(1); + memcpy(p, buffer, len+1); + return p; +} + +static void dive_end(void) +{ + if (!dive) + return; + if (!dive->name) + dive->name = generate_name(dive); + record_dive(dive); + dive = NULL; +} + +static void sample_start(void) +{ + int nr; + + if (!dive) + return; + nr = dive->samples; + if (nr >= alloc_samples) { + unsigned int size; + + alloc_samples = (alloc_samples * 3)/2 + 10; + size = dive_size(alloc_samples); + dive = realloc(dive, size); + if (!dive) + return; + } + sample = dive->sample + nr; + memset(sample, 0, sizeof(*sample)); +} + +static void sample_end(void) +{ + if (!dive) + return; + + if (sample->time.seconds > dive->duration.seconds) { + if (sample->depth.mm) + dive->duration = sample->time; + } + + if (sample->depth.mm > dive->maxdepth.mm) + dive->maxdepth.mm = sample->depth.mm; + + sample = NULL; + dive->samples++; +} + +static void entry(const char *name, int size, const char *raw) +{ + char *buf = malloc(size+1); + + if (!buf) + return; + memcpy(buf, raw, size); + buf[size] = 0; + if (sample) { + try_to_fill_sample(sample, name, buf); + return; + } + if (dive) { + try_to_fill_dive(dive, name, buf); + return; + } +} + +static const char *nodename(xmlNode *node, char *buf, int len) +{ + if (!node || !node->name) + return "root"; + + buf += len; + *--buf = 0; + len--; + + for(;;) { + const char *name = node->name; + int i = strlen(name); + while (--i >= 0) { + unsigned char c = name[i]; + *--buf = tolower(c); + if (!--len) + return buf; + } + node = node->parent; + if (!node || !node->name) + return buf; + *--buf = '.'; + if (!--len) + return buf; + } +} + +#define MAXNAME 64 + +static void visit_one_node(xmlNode *node) +{ + int len; + const unsigned char *content; + char buffer[MAXNAME]; + const char *name; + + content = node->content; + if (!content) + return; + + /* Trim whitespace at beginning */ + while (isspace(*content)) + content++; + + /* Trim whitespace at end */ + len = strlen(content); + while (len && isspace(content[len-1])) + len--; + + if (!len) + return; + + /* Don't print out the node name if it is "text" */ + if (!strcmp(node->name, "text")) + node = node->parent; + + name = nodename(node, buffer, sizeof(buffer)); + + entry(name, len, content); +} + +static void traverse(xmlNode *node) +{ + 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; + } + + /* + * 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; + } + + /* Anything else - just visit it and recurse */ + visit_one_node(n); + traverse(n->children); + } +} + +void parse_xml_file(const char *filename) +{ + xmlDoc *doc; + + doc = xmlReadFile(filename, NULL, 0); + if (!doc) { + fprintf(stderr, "Failed to parse '%s'.\n", filename); + return; + } + + dive_start(); + traverse(xmlDocGetRootElement(doc)); + dive_end(); + xmlFreeDoc(doc); + xmlCleanupParser(); +} + +void parse_xml_init(void) +{ + LIBXML_TEST_VERSION +} diff --git a/parse.c b/parse.c deleted file mode 100644 index 58d446d..0000000 --- a/parse.c +++ /dev/null @@ -1,593 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include - -#include "dive.h" - -int verbose; - -struct dive_table dive_table; - -/* - * Add a dive into the dive_table array - */ -static void record_dive(struct dive *dive) -{ - 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) -{ - if (verbose > 1) - printf("Unable to match %s '(%.*s)%s' (%s)\n", type, - (int) (name - fullname), fullname, name, - buffer); - free(buffer); -} - -static const char *last_part(const char *name) -{ - const char *p = strrchr(name, '.'); - return p ? p+1 : name; -} - -typedef void (*matchfn_t)(char *buffer, void *); - -static int match(const char *pattern, const char *name, matchfn_t fn, char *buf, void *data) -{ - if (strcasecmp(pattern, name)) - return 0; - fn(buf, data); - return 1; -} - -/* - * Dive info as it is being built up.. - */ -static int alloc_samples; -static struct dive *dive; -static struct sample *sample; -static struct tm tm; - -static time_t utc_mktime(struct tm *tm) -{ - static const int mdays[] = { - 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 - }; - int year = tm->tm_year; - int month = tm->tm_mon; - int day = tm->tm_mday; - - /* First normalize relative to 1900 */ - if (year < 70) - year += 100; - else if (year > 1900) - year -= 1900; - - /* Normalized to Jan 1, 1970: unix time */ - year -= 70; - - if (year < 0 || year > 129) /* algo only works for 1970-2099 */ - return -1; - if (month < 0 || month > 11) /* array bounds */ - return -1; - if (month < 2 || (year + 2) % 4) - day--; - if (tm->tm_hour < 0 || tm->tm_min < 0 || tm->tm_sec < 0) - return -1; - return (year * 365 + (year + 1) / 4 + mdays[month] + day) * 24*60*60UL + - tm->tm_hour * 60*60 + tm->tm_min * 60 + tm->tm_sec; -} - -static void divedate(char *buffer, void *_when) -{ - int d,m,y; - time_t *when = _when; - - 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); - } - free(buffer); -} - -static void divetime(char *buffer, void *_when) -{ - int h,m,s = 0; - time_t *when = _when; - - if (sscanf(buffer, "%d:%d:%d", &h, &m, &s) >= 2) { - tm.tm_hour = h; - tm.tm_min = m; - tm.tm_sec = s; - if (tm.tm_year) - *when = utc_mktime(&tm); - } - 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)) { - /* All values are probably in meters */ - case INTEGER: - val.fp = val.i; - /* fallthrough */ - 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); -} - -/* 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); - - if (match("date", last, divedate, buf, &dive->when)) - 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); -} - -static unsigned int dive_size(int samples) -{ - return sizeof(struct dive) + samples*sizeof(struct sample); -} - -/* - * File boundaries are dive boundaries. But sometimes there are - * multiple dives per file, so there can be other events too that - * trigger a "new dive" marker and you may get some nesting due - * to that. Just ignore nesting levels. - */ -static void dive_start(void) -{ - unsigned int size; - - if (dive) - return; - - alloc_samples = 5; - size = dive_size(alloc_samples); - dive = malloc(size); - if (!dive) - exit(1); - memset(dive, 0, size); - memset(&tm, 0, sizeof(tm)); -} - -static char *generate_name(struct dive *dive) -{ - int len; - struct tm *tm; - char buffer[256], *p; - - tm = gmtime(&dive->when); - - len = snprintf(buffer, sizeof(buffer), - "%04d-%02d-%02d " - "%02d:%02d:%02d " - "(%d ft, %d min)", - tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec, - to_feet(dive->maxdepth), dive->duration.seconds / 60); - p = malloc(len+1); - if (!p) - exit(1); - memcpy(p, buffer, len+1); - return p; -} - -static void dive_end(void) -{ - if (!dive) - return; - if (!dive->name) - dive->name = generate_name(dive); - record_dive(dive); - dive = NULL; -} - -static void sample_start(void) -{ - int nr; - - if (!dive) - return; - nr = dive->samples; - if (nr >= alloc_samples) { - unsigned int size; - - alloc_samples = (alloc_samples * 3)/2 + 10; - size = dive_size(alloc_samples); - dive = realloc(dive, size); - if (!dive) - return; - } - sample = dive->sample + nr; - memset(sample, 0, sizeof(*sample)); -} - -static void sample_end(void) -{ - if (!dive) - return; - - if (sample->time.seconds > dive->duration.seconds) { - if (sample->depth.mm) - dive->duration = sample->time; - } - - if (sample->depth.mm > dive->maxdepth.mm) - dive->maxdepth.mm = sample->depth.mm; - - sample = NULL; - dive->samples++; -} - -static void entry(const char *name, int size, const char *raw) -{ - char *buf = malloc(size+1); - - if (!buf) - return; - memcpy(buf, raw, size); - buf[size] = 0; - if (sample) { - try_to_fill_sample(sample, name, buf); - return; - } - if (dive) { - try_to_fill_dive(dive, name, buf); - return; - } -} - -static const char *nodename(xmlNode *node, char *buf, int len) -{ - if (!node || !node->name) - return "root"; - - buf += len; - *--buf = 0; - len--; - - for(;;) { - const char *name = node->name; - int i = strlen(name); - while (--i >= 0) { - unsigned char c = name[i]; - *--buf = tolower(c); - if (!--len) - return buf; - } - node = node->parent; - if (!node || !node->name) - return buf; - *--buf = '.'; - if (!--len) - return buf; - } -} - -#define MAXNAME 64 - -static void visit_one_node(xmlNode *node) -{ - int len; - const unsigned char *content; - char buffer[MAXNAME]; - const char *name; - - content = node->content; - if (!content) - return; - - /* Trim whitespace at beginning */ - while (isspace(*content)) - content++; - - /* Trim whitespace at end */ - len = strlen(content); - while (len && isspace(content[len-1])) - len--; - - if (!len) - return; - - /* Don't print out the node name if it is "text" */ - if (!strcmp(node->name, "text")) - node = node->parent; - - name = nodename(node, buffer, sizeof(buffer)); - - entry(name, len, content); -} - -static void traverse(xmlNode *node) -{ - 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; - } - - /* - * 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; - } - - /* Anything else - just visit it and recurse */ - visit_one_node(n); - traverse(n->children); - } -} - -void parse_xml_file(const char *filename) -{ - xmlDoc *doc; - - doc = xmlReadFile(filename, NULL, 0); - if (!doc) { - fprintf(stderr, "Failed to parse '%s'.\n", filename); - return; - } - - dive_start(); - traverse(xmlDocGetRootElement(doc)); - dive_end(); - xmlFreeDoc(doc); - xmlCleanupParser(); -} - -void parse_xml_init(void) -{ - LIBXML_TEST_VERSION -}