X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=e6472735dcdd40ca91bf69daebcb035ac7ed9be7;hb=3a77eb85101a5fb1dc186b88a3a02d2ae27690c7;hp=e14d9db2b74ed0e7ac94ba9f2e6f30807d7d22ac;hpb=0282d515db875cee0139e121db13084be0caac82;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index e14d9db..e647273 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -16,7 +16,7 @@ struct dive_table dive_table;
 /*
  * 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;
@@ -90,11 +90,16 @@ const struct units IMPERIAL_units = {
 /*
  * 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,
@@ -105,7 +110,7 @@ static enum import_source {
 	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
@@ -423,7 +428,7 @@ static void water_pressure(char *buffer, void *_depth)
 		 * 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;
@@ -522,7 +527,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.
@@ -559,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)
 {
@@ -653,6 +684,7 @@ static int divinglog_dive_match(struct dive *dive, const char *name, int len, ch
 		MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
 		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) ||
@@ -882,6 +914,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,10 +996,16 @@ 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))
 		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;
@@ -984,21 +1036,13 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
  */
 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;
 
@@ -1125,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)
+		add_event(dive, event.time.seconds, event.type, event.flags, event.value, event.name);
+	event.active = 0;
 }
 
 static void cylinder_start(void)
@@ -1143,23 +1191,7 @@ static void cylinder_end(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)
@@ -1167,8 +1199,8 @@ 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)
@@ -1179,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;
@@ -1376,14 +1412,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));