/*
* Add a dive into the dive_table array
*/
-static void record_dive(struct dive *dive)
+void record_dive(struct dive *dive)
{
int nr = dive_table.nr, allocated = dive_table.allocated;
struct dive **dives = dive_table.dives;
/*
* Dive info as it is being built up..
*/
-static int alloc_samples;
static struct dive *dive;
static struct sample *sample;
+static struct {
+ int active;
+ duration_t time;
+ int type, flags, value;
+ const char *name;
+} event;
static struct tm tm;
-static int event_index, cylinder_index;
+static int cylinder_index;
static enum import_source {
UNKNOWN,
UDDF,
} import_source;
-static time_t utc_mktime(struct tm *tm)
+time_t utc_mktime(struct tm *tm)
{
static const int mdays[] = {
0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
static void water_pressure(char *buffer, void *_depth)
{
depth_t *depth = _depth;
- union int_or_float val;
+ union int_or_float val;
double atm, cm;
- switch (integer_or_float(buffer, &val)) {
- case FLOAT:
+ switch (integer_or_float(buffer, &val)) {
+ case FLOAT:
if (!val.fp)
break;
/* cbar to atm */
* atm to cm. Why not mm? The precision just isn't
* there.
*/
- cm = 100 * (atm - 1) + 0.5;
+ cm = 100 * atm + 0.5;
if (cm > 0) {
depth->mm = 10 * (long)cm;
break;
static void decicelsius(char *buffer, void *_temp)
{
temperature_t *temp = _temp;
- union int_or_float val;
+ union int_or_float val;
- switch (integer_or_float(buffer, &val)) {
- case FLOAT:
+ switch (integer_or_float(buffer, &val)) {
+ case FLOAT:
temp->mkelvin = (val.fp/10 + 273.15) * 1000 + 0.5;
break;
default:
* Divinglog is crazy. The temperatures are in celsius. EXCEPT
* for the sample temperatures, that are in Fahrenheit.
* WTF?
+ *
+ * Oh, and I think Diving Log *internally* probably kept them
+ * in celsius, because I'm seeing entries like
+ *
+ * <Temp>32.0</Temp>
+ *
+ * in there. Which is freezing, aka 0 degC. I bet the "0" is
+ * what Diving Log uses for "no temperature".
+ *
+ * So throw away crap like that.
*/
static void fahrenheit(char *buffer, void *_temperature)
{
switch (integer_or_float(buffer, &val)) {
case FLOAT:
+ /* Floating point equality is evil, but works for small integers */
+ if (val.fp == 32.0)
+ break;
temperature->mkelvin = (val.fp + 459.67) * 5000/9;
break;
default:
free(buffer);
}
+/*
+ * Did I mention how bat-shit crazy divinglog is? The sample
+ * pressures are in PSI. But the tank working pressure is in
+ * bar. WTF^2?
+ *
+ * Crazy stuff like this is why subsurface has everything in
+ * these inconvenient typed structures, and you have to say
+ * "pressure->mbar" to get the actual value. Exactly so that
+ * you can never have unit confusion.
+ */
+static void psi(char *buffer, void *_pressure)
+{
+ pressure_t *pressure = _pressure;
+ union int_or_float val;
+
+ switch (integer_or_float(buffer, &val)) {
+ case FLOAT:
+ pressure->mbar = val.fp * 68.95 + 0.5;
+ break;
+ default:
+ fprintf(stderr, "Crazy Diving Log PSI reading %s\n", buffer);
+ }
+ free(buffer);
+}
+
static int divinglog_fill_sample(struct sample *sample, const char *name, int len, char *buf)
{
return MATCH(".p.time", sampletime, &sample->time) ||
MATCH(".p.depth", depth, &sample->depth) ||
MATCH(".p.temp", fahrenheit, &sample->temperature) ||
- MATCH(".p.press1", pressure, &sample->cylinderpressure) ||
+ MATCH(".p.press1", psi, &sample->cylinderpressure) ||
0;
}
0;
}
+static void eventtime(char *buffer, void *_duration)
+{
+ duration_t *duration = _duration;
+ sampletime(buffer, duration);
+ if (sample)
+ duration->seconds += sample->time.seconds;
+}
+
+static void try_to_fill_event(const char *name, char *buf)
+{
+ int len = strlen(name);
+
+ start_match("event", name, buf);
+ if (MATCH(".event", utf8_string, &event.name))
+ return;
+ if (MATCH(".name", utf8_string, &event.name))
+ return;
+ if (MATCH(".time", eventtime, &event.time))
+ return;
+ if (MATCH(".type", get_index, &event.type))
+ return;
+ if (MATCH(".flags", get_index, &event.flags))
+ return;
+ nonmatch("event", name, buf);
+}
+
/* 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)
{
MATCH(".entrytime", divetime, &dive->when) ||
MATCH(".depth", depth, &dive->maxdepth) ||
MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
- MATCH(".tanktype", utf8_string, &dive->cylinder[0].type.description) ||
+ MATCH(".presw", pressure, &dive->cylinder[0].type.workingpressure) ||
MATCH(".comments", utf8_string, &dive->notes) ||
+ MATCH(".buddy.names", utf8_string, &dive->buddy) ||
MATCH(".country.name", utf8_string, &country) ||
MATCH(".city.name", utf8_string, &city) ||
MATCH(".place.name", divinglog_place, &dive->location) ||
static void uemis_date_time(char *buffer, void *_when)
{
time_t *when = _when;
- union int_or_float val;
+ union int_or_float val;
- switch (integer_or_float(buffer, &val)) {
- case FLOAT:
+ switch (integer_or_float(buffer, &val)) {
+ case FLOAT:
*when = (val.fp - 40587) * 86400;
break;
default:
0;
}
+static void gps_location(char *buffer, void *_dive)
+{
+ int i;
+ struct dive *dive = _dive;
+ double latitude, longitude;
+
+ i = sscanf(buffer, "%lf %lf", &latitude, &longitude);
+ if (i == 2) {
+ dive->latitude = latitude;
+ dive->longitude = longitude;
+ }
+ free(buffer);
+}
+
/* 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)
{
break;
}
+ if (MATCH(".number", get_index, &dive->number))
+ return;
if (MATCH(".date", divedate, &dive->when))
return;
if (MATCH(".time", divetime, &dive->when))
return;
if (MATCH(".cylinderendpressure", pressure, &dive->cylinder[0].end))
return;
+ if (MATCH(".gps", gps_location, dive))
+ return;
if (MATCH(".location", utf8_string, &dive->location))
return;
if (MATCH(".notes", utf8_string, &dive->notes))
return;
+ if (MATCH(".divemaster", utf8_string, &dive->divemaster))
+ return;
+ if (MATCH(".buddy", utf8_string, &dive->buddy))
+ return;
if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cylinder_index].type.size))
return;
*/
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);
+ dive = alloc_dive();
memset(&tm, 0, sizeof(tm));
}
-static void sanitize_gasmix(gasmix_t *mix)
+static void sanitize_gasmix(struct gasmix *mix)
{
unsigned int o2, he;
*/
static void match_standard_cylinder(cylinder_type_t *type)
{
- int psi, cuft, len;
+ double cuft;
+ int psi, len;
const char *fmt;
char buffer[20], *p;
if (type->description)
return;
- cuft = type->size.mliter / 1000;
+ cuft = type->size.mliter / 28317.0;
+ cuft *= type->workingpressure.mbar / 1013.25;
psi = type->workingpressure.mbar / 68.95;
switch (psi) {
fmt = "LP%d";
break;
case 2600 ... 2700: /* 2640 psi: LP+10% */
- fmt = "LP%d+";
+ fmt = "LP%d";
break;
case 2900 ... 3100: /* 3000 psi: ALx tank */
fmt = "AL%d";
default:
return;
}
- len = snprintf(buffer, sizeof(buffer), fmt, cuft);
+ len = snprintf(buffer, sizeof(buffer), fmt, (int) (cuft+0.5));
p = malloc(len+1);
if (!p)
return;
if (!type->size.mliter)
return;
+ if (input_units.volume == CUFT || import_source == SUUNTO) {
+ volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */
+ atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */
+ volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */
+ type->size.mliter = volume + 0.5;
+ }
+
/* Ok, we have both size and pressure: try to match a description */
match_standard_cylinder(type);
-
- /* .. and let's assume that the 'size' was cu ft of air */
- volume_of_air = type->size.mliter * 28.317; /* milli-cu ft to milliliter */
- atm = type->workingpressure.mbar / 1013.25; /* working pressure in atm */
- volume = volume_of_air / atm; /* milliliters at 1 atm: "true size" */
- type->size.mliter = volume + 0.5;
}
static void sanitize_cylinder_info(struct dive *dive)
static void event_start(void)
{
+ memset(&event, 0, sizeof(event));
+ event.active = 1;
}
static void event_end(void)
{
- event_index++;
+ if (event.name)
+ add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name);
+ event.active = 0;
}
static void cylinder_start(void)
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));
- event_index = 0;
+ sample = prepare_sample(&dive);
}
static void sample_end(void)
if (!dive)
return;
+ finish_sample(dive, sample);
sample = NULL;
- dive->samples++;
}
static void entry(const char *name, int size, const char *raw)
return;
memcpy(buf, raw, size);
buf[size] = 0;
+ if (event.active) {
+ try_to_fill_event(name, buf);
+ return;
+ }
if (sample) {
try_to_fill_sample(sample, name, buf);
return;
*
* Temperatures are in C, except in samples,
* when they are in Fahrenheit. Depths are in
- * meters, but pressure is in PSI.
+ * meters, an dpressure is in PSI in the samples,
+ * but in bar when it comes to working pressure.
+ *
+ * Crazy f*%^ morons.
*/
input_units = SI_units;
- input_units.pressure = PSI;
}
static void uddf_importer(void)
fprintf(stderr, "Failed to parse '%s'.\n", filename);
if (error != NULL)
{
- *error = g_error_new(g_quark_from_string("divelog"),
- DIVE_ERROR_PARSE,
- "Failed to parse '%s'",
- filename);
+ *error = g_error_new(g_quark_from_string("subsurface"),
+ DIVE_ERROR_PARSE,
+ "Failed to parse '%s'",
+ filename);
}
return;
}
-
+ /* we assume that the last (or only) filename passed as argument is a
+ * great filename to use as default when saving the dives */
+ set_filename(filename);
reset_all();
dive_start();
traverse(xmlDocGetRootElement(doc));
projects / ext / subsurface.git / blobdiff