X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=6eafb0d3aaf993bf8efc78b5d6916387ac0f3c0a;hb=2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6;hp=22ab8458e1f5871d932d4d5666c5df7ccc1a94dc;hpb=5804c2970eaaf0215b9862f767cf7aa745083744;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 22ab845..6eafb0d 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -92,8 +92,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,
@@ -558,6 +564,32 @@ 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;
+	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)
 {
@@ -1051,7 +1083,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) {
@@ -1106,7 +1138,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;
 	}
@@ -1137,11 +1169,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)
@@ -1156,7 +1192,6 @@ static void cylinder_end(void)
 static void sample_start(void)
 {
 	sample = prepare_sample(&dive);
-	event_index = 0;
 }
 
 static void sample_end(void)
@@ -1176,6 +1211,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;
@@ -1380,7 +1419,9 @@ void parse_xml_file(const char *filename, GError **error)
 		}
 		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));