#include <libxml/parser.h>
#include <libxml/tree.h>
-static int verbose;
+#include "dive.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;
-
-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;
-}
+int verbose;
-struct sample {
- duration_t time;
- depth_t depth;
- temperature_t temperature;
- pressure_t tankpressure;
- int tankindex;
-};
-
-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[];
-};
-
-static struct dive **dive_table;
-static int nr_dives, nr_allocated;
+struct dive_table dive_table;
+/*
+ * Add a dive into the dive_table array
+ */
static void record_dive(struct dive *dive)
{
- if (nr_dives >= nr_allocated) {
- nr_allocated = (nr_dives + 32) * 3 / 2;
- dive_table = realloc(dive_table, nr_allocated * sizeof(struct dive *));
- if (!dive_table)
- exit(1);
- }
- dive_table[nr_dives++] = dive;
-}
+ int nr = dive_table.nr, allocated = dive_table.allocated;
+ struct dive **dives = dive_table.dives;
-static void show_dive(int nr, struct dive *dive)
-{
- int i;
- 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);
-
- if (!verbose)
- return;
-
- 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));
+ 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;
}
-}
-
-static int sortfn(const void *_a, const void *_b)
-{
- const struct dive *a = *(void **)_a;
- const struct dive *b = *(void **)_b;
-
- if (a->when < b->when)
- return -1;
- if (a->when > b->when)
- return 1;
- return 0;
-}
-
-static void report_dives(void)
-{
- int i;
- qsort(dive_table, nr_dives, sizeof(struct dive *), sortfn);
-
- for (i = 0; i < nr_dives; i++)
- show_dive(i+1, dive_table[i]);
+ dives[nr] = dive;
+ dive_table.nr = nr+1;
}
static void nonmatch(const char *type, const char *fullname, const char *name, char *buffer)
union int_or_float val;
switch (integer_or_float(buffer, &val)) {
- /* Integer values are probably in feet */
+ /* All values are probably in meters */
case INTEGER:
- depth->mm = 304.8 * val.i;
- break;
- /* Float? Probably meters.. */
+ val.fp = val.i;
+ /* fallthrough */
case FLOAT:
depth->mm = val.fp * 1000;
break;
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)\n",
+ 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 const char *nodename(xmlNode *node, char *buf, int len)
{
-
if (!node || !node->name)
return "root";
}
}
-static void parse(const char *filename)
+void parse_xml_file(const char *filename)
{
xmlDoc *doc;
xmlCleanupParser();
}
-static void parse_argument(const char *arg)
+void parse_xml_init(void)
{
- const char *p = arg+1;
-
- do {
- switch (*p) {
- case 'v':
- verbose++;
- continue;
- default:
- fprintf(stderr, "Bad argument '%s'\n", arg);
- exit(1);
- }
- } while (*++p);
-}
-
-int main(int argc, char **argv)
-{
- int i;
-
LIBXML_TEST_VERSION
-
- for (i = 1; i < argc; i++) {
- const char *a = argv[i];
-
- if (a[0] == '-') {
- parse_argument(a);
- continue;
- }
- parse(a);
- }
- report_dives();
- return 0;
}