X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=4e68e8ee25e9ee3fa9cbc823b58d51db87a2b8b8;hb=f2566ba561ff8eb560e71dd89de5e66e46e7143d;hp=82149cf8aca5c7c76cf7b5bc5a6b012f1ea4d1ef;hpb=ed4e71a817e370f397d5f4b7dc613f01b5564456;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 82149cf..4e68e8e 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -8,6 +8,7 @@
 #include <libxml/tree.h>
 
 #include "dive.h"
+#include "uemis.h"
 
 int verbose;
 
@@ -92,8 +93,14 @@ const struct units IMPERIAL_units = {
  */
 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,
@@ -521,7 +528,7 @@ static void fahrenheit(char *buffer, void *_temperature)
  * pressures are in PSI. But the tank working pressure is in
  * bar. WTF^2?
  *
- * Crazy stuff like this is why diveclog has everything in
+ * 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.
@@ -558,6 +565,34 @@ static int uddf_fill_sample(struct sample *sample, const char *name, int len, ch
 		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;
+	if (MATCH(".value", get_index, &event.value))
+		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)
 {
@@ -827,6 +862,7 @@ static int uemis_dive_match(struct dive *dive, const char *name, int len, char *
 		MATCH(".nitrox_3.deco_tank.oxygen", uemis_percent, dive->cylinder + 5) ||
 		MATCH(".nitrox_3.travel_tank.size", uemis_cylindersize, dive->cylinder + 6) ||
 		MATCH(".nitrox_3.travel_tank.oxygen", uemis_percent, dive->cylinder + 6) ||
+		MATCH(".dive.val.bin", uemis_parse_divelog_binary, &dive) ||
 		0;
 }
 
@@ -882,6 +918,20 @@ static int uddf_dive_match(struct dive *dive, const char *name, int len, char *b
 		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)
 {
@@ -950,6 +1000,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 		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))
@@ -1035,7 +1087,7 @@ static void match_standard_cylinder(cylinder_type_t *type)
 		return;
 
 	cuft = type->size.mliter / 28317.0;
-	cuft *= type->workingpressure.mbar / 1013.25;
+	cuft *= to_ATM(type->workingpressure);
 	psi = type->workingpressure.mbar / 68.95;
 
 	switch (psi) {
@@ -1090,7 +1142,7 @@ static void sanitize_cylinder_type(cylinder_type_t *type)
 
 	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 */
+		atm = to_ATM(type->workingpressure);		/* working pressure in atm */
 		volume = volume_of_air / atm;			/* milliliters at 1 atm: "true size" */
 		type->size.mliter = volume + 0.5;
 	}
@@ -1121,11 +1173,15 @@ static void dive_end(void)
 
 static void event_start(void)
 {
+	memset(&event, 0, sizeof(event));
+	event.active = 1;
 }
 
 static void event_end(void)
 {
-	event_index++;
+	if (event.name && strcmp(event.name, "surface") != 0)
+		add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name);
+	event.active = 0;
 }
 
 static void cylinder_start(void)
@@ -1140,7 +1196,6 @@ static void cylinder_end(void)
 static void sample_start(void)
 {
 	sample = prepare_sample(&dive);
-	event_index = 0;
 }
 
 static void sample_end(void)
@@ -1160,6 +1215,10 @@ 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;
@@ -1308,6 +1367,7 @@ static struct nesting {
 	{ "SUUNTO", suunto_importer },
 	{ "Divinglog", DivingLog_importer },
 	{ "pre_dive", uemis_importer },
+	{ "dives", uemis_importer },
 	{ "uddf", uddf_importer },
 
 	{ NULL, }
@@ -1357,14 +1417,16 @@ void parse_xml_file(const char *filename, GError **error)
 		fprintf(stderr, "Failed to parse '%s'.\n", filename);
 		if (error != NULL)
 		{
-			*error = g_error_new(g_quark_from_string("divelog"),
+			*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));