X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=parse-xml.c;h=d6fc953a7cbc075bd2317ee24ce8c61314b03aea;hp=34afdb9f690dc22fa83d6f08a94aaaddd13f1ce4;hb=618a20ba5f2a9adc0e5a35117535f8eaa9fd34a4;hpb=854bd0269c05adc56caf9667fd68f676520a2941

diff --git a/parse-xml.c b/parse-xml.c
index 34afdb9..d6fc953 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -39,6 +39,65 @@ void record_dive(struct dive *dive)
 	dive_table.nr = nr+1;
 }
 
+static void delete_dive_renumber(struct dive **dives, int i, int nr)
+{
+	struct dive *dive = dives[i];
+	int number = dive->number, j;
+
+	if (!number)
+		return;
+
+	/*
+	 * Check that all numbered dives after the deleted
+	 * ones are consecutive, return without renumbering
+	 * if that is not the case.
+	 */
+	for (j = i+1; j < nr; j++) {
+		struct dive *next = dives[j];
+		if (!next->number)
+			break;
+		number++;
+		if (next->number != number)
+			return;
+	}
+
+	/*
+	 * Ok, we hit the end of the dives or a unnumbered
+	 * dive - renumber.
+	 */
+	for (j = i+1 ; j < nr; j++) {
+		struct dive *next = dives[j];
+		if (!next->number)
+			break;
+		next->number--;
+	}
+}
+
+/*
+ * Remove a dive from the dive_table array
+ */
+void delete_dive(struct dive *dive)
+{
+	int nr = dive_table.nr, i;
+	struct dive **dives = dive_table.dives;
+
+	/*
+	 * Stupid. We know the dive table is sorted by date,
+	 * we could do a binary lookup. Sue me.
+	 */
+	for (i = 0; i < nr; i++) {
+		struct dive *d = dives[i];
+		if (d != dive)
+			continue;
+		/* should we re-number? */
+		delete_dive_renumber(dives, i, nr);
+		memmove(dives+i, dives+i+1, sizeof(struct dive *)*(nr-i-1));
+		dives[nr] = NULL;
+		dive_table.nr = nr-1;
+		break;
+	}
+}
+
 static void start_match(const char *type, const char *name, char *buffer)
 {
 	if (verbose > 2)
@@ -97,16 +156,16 @@ const struct units IMPERIAL_units = {
 /*
  * Dive info as it is being built up..
  */
-static struct dive *dive;
-static struct sample *sample;
+static struct dive *cur_dive;
+static struct sample *cur_sample;
 static struct {
 	int active;
 	duration_t time;
 	int type, flags, value;
 	const char *name;
-} event;
-static struct tm tm;
-static int cylinder_index, ws_index;
+} cur_event;
+static struct tm cur_tm;
+static int cur_cylinder_index, cur_ws_index;
 
 static enum import_source {
 	UNKNOWN,
@@ -152,22 +211,22 @@ static void divedate(char *buffer, void *_when)
 	time_t *when = _when;
 	int success = 0;
 
-	success = tm.tm_sec | tm.tm_min | tm.tm_hour;
+	success = cur_tm.tm_sec | cur_tm.tm_min | cur_tm.tm_hour;
 	if (sscanf(buffer, "%d.%d.%d", &d, &m, &y) == 3) {
-		tm.tm_year = y;
-		tm.tm_mon = m-1;
-		tm.tm_mday = d;
+		cur_tm.tm_year = y;
+		cur_tm.tm_mon = m-1;
+		cur_tm.tm_mday = d;
 	} else if (sscanf(buffer, "%d-%d-%d", &y, &m, &d) == 3) {
-		tm.tm_year = y;
-		tm.tm_mon = m-1;
-		tm.tm_mday = d;
+		cur_tm.tm_year = y;
+		cur_tm.tm_mon = m-1;
+		cur_tm.tm_mday = d;
 	} else {
 		fprintf(stderr, "Unable to parse date '%s'\n", buffer);
 		success = 0;
 	}
 
 	if (success)
-		*when = utc_mktime(&tm);
+		*when = utc_mktime(&cur_tm);
 
 	free(buffer);
 }
@@ -178,11 +237,11 @@ static void divetime(char *buffer, void *_when)
 	time_t *when = _when;
 
 	if (sscanf(buffer, "%d:%d:%d", &h, &m, &s) >= 2) {
-		tm.tm_hour = h;
-		tm.tm_min = m;
-		tm.tm_sec = s;
-		if (tm.tm_year)
-			*when = utc_mktime(&tm);
+		cur_tm.tm_hour = h;
+		cur_tm.tm_min = m;
+		cur_tm.tm_sec = s;
+		if (cur_tm.tm_year)
+			*when = utc_mktime(&cur_tm);
 	}
 	free(buffer);
 }
@@ -196,13 +255,13 @@ static void divedatetime(char *buffer, void *_when)
 
 	if (sscanf(buffer, "%d-%d-%d %d:%d:%d",
 		&y, &m, &d, &hr, &min, &sec) == 6) {
-		tm.tm_year = y;
-		tm.tm_mon = m-1;
-		tm.tm_mday = d;
-		tm.tm_hour = hr;
-		tm.tm_min = min;
-		tm.tm_sec = sec;
-		*when = utc_mktime(&tm);
+		cur_tm.tm_year = y;
+		cur_tm.tm_mon = m-1;
+		cur_tm.tm_mday = d;
+		cur_tm.tm_hour = hr;
+		cur_tm.tm_min = min;
+		cur_tm.tm_sec = sec;
+		*when = utc_mktime(&cur_tm);
 	}
 	free(buffer);
 }
@@ -398,7 +457,7 @@ static void gasmix(char *buffer, void *_fraction)
 	/* libdivecomputer does negative percentages. */
 	if (*buffer == '-')
 		return;
-	if (cylinder_index < MAX_CYLINDERS)
+	if (cur_cylinder_index < MAX_CYLINDERS)
 		percent(buffer, _fraction);
 }
 
@@ -588,6 +647,7 @@ static int uddf_fill_sample(struct sample *sample, const char *name, int len, ch
 	return	MATCH(".divetime", sampletime, &sample->time) ||
 		MATCH(".depth", depth, &sample->depth) ||
 		MATCH(".temperature", temperature, &sample->temperature) ||
+		MATCH(".tankpressure", pressure, &sample->cylinderpressure) ||
 		0;
 }
 
@@ -595,8 +655,8 @@ static void eventtime(char *buffer, void *_duration)
 {
 	duration_t *duration = _duration;
 	sampletime(buffer, duration);
-	if (sample)
-		duration->seconds += sample->time.seconds;
+	if (cur_sample)
+		duration->seconds += cur_sample->time.seconds;
 }
 
 static void try_to_fill_event(const char *name, char *buf)
@@ -604,17 +664,17 @@ 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))
+	if (MATCH(".event", utf8_string, &cur_event.name))
 		return;
-	if (MATCH(".name", utf8_string, &event.name))
+	if (MATCH(".name", utf8_string, &cur_event.name))
 		return;
-	if (MATCH(".time", eventtime, &event.time))
+	if (MATCH(".time", eventtime, &cur_event.time))
 		return;
-	if (MATCH(".type", get_index, &event.type))
+	if (MATCH(".type", get_index, &cur_event.type))
 		return;
-	if (MATCH(".flags", get_index, &event.flags))
+	if (MATCH(".flags", get_index, &cur_event.flags))
 		return;
-	if (MATCH(".value", get_index, &event.value))
+	if (MATCH(".value", get_index, &cur_event.value))
 		return;
 	nonmatch("event", name, buf);
 }
@@ -826,7 +886,7 @@ static int uemis_gas_template;
 static int uemis_cylinder_index(void *_cylinder)
 {
 	cylinder_t *cylinder = _cylinder;
-	unsigned int index = cylinder - dive->cylinder;
+	unsigned int index = cylinder - cur_dive->cylinder;
 
 	if (index > 6) {
 		fprintf(stderr, "Uemis cylinder pointer calculations broken\n");
@@ -858,14 +918,14 @@ static void uemis_cylindersize(char *buffer, void *_cylinder)
 {
 	int index = uemis_cylinder_index(_cylinder);
 	if (index >= 0)
-		cylindersize(buffer, &dive->cylinder[index].type.size);
+		cylindersize(buffer, &cur_dive->cylinder[index].type.size);
 }
 
 static void uemis_percent(char *buffer, void *_cylinder)
 {
 	int index = uemis_cylinder_index(_cylinder);
 	if (index >= 0)
-		percent(buffer, &dive->cylinder[index].gasmix.o2);
+		percent(buffer, &cur_dive->cylinder[index].gasmix.o2);
 }
 
 static int uemis_dive_match(struct dive **divep, const char *name, int len, char *buf)
@@ -1048,27 +1108,27 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
 		return;
 	if (MATCH(".rating", get_index, &dive->rating))
 		return;
-	if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cylinder_index].type.size))
+	if (MATCH(".cylinder.size", cylindersize, &dive->cylinder[cur_cylinder_index].type.size))
 		return;
-	if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cylinder_index].type.workingpressure))
+	if (MATCH(".cylinder.workpressure", pressure, &dive->cylinder[cur_cylinder_index].type.workingpressure))
 		return;
-	if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cylinder_index].type.description))
+	if (MATCH(".cylinder.description", utf8_string, &dive->cylinder[cur_cylinder_index].type.description))
 		return;
-	if (MATCH(".cylinder.start", pressure, &dive->cylinder[cylinder_index].start))
+	if (MATCH(".cylinder.start", pressure, &dive->cylinder[cur_cylinder_index].start))
 		return;
-	if (MATCH(".cylinder.end", pressure, &dive->cylinder[cylinder_index].end))
+	if (MATCH(".cylinder.end", pressure, &dive->cylinder[cur_cylinder_index].end))
 		return;
-	if (MATCH(".weightsystem.description", utf8_string, &dive->weightsystem[ws_index].description))
+	if (MATCH(".weightsystem.description", utf8_string, &dive->weightsystem[cur_ws_index].description))
 		return;
-	if (MATCH(".weightsystem.weight", weight, &dive->weightsystem[ws_index].weight))
+	if (MATCH(".weightsystem.weight", weight, &dive->weightsystem[cur_ws_index].weight))
 		return;
-	if (MATCH("weight", weight, &dive->weightsystem[ws_index].weight))
+	if (MATCH("weight", weight, &dive->weightsystem[cur_ws_index].weight))
 		return;
-	if (MATCH(".o2", gasmix, &dive->cylinder[cylinder_index].gasmix.o2))
+	if (MATCH(".o2", gasmix, &dive->cylinder[cur_cylinder_index].gasmix.o2))
 		return;
-	if (MATCH(".n2", gasmix_nitrogen, &dive->cylinder[cylinder_index].gasmix))
+	if (MATCH(".n2", gasmix_nitrogen, &dive->cylinder[cur_cylinder_index].gasmix))
 		return;
-	if (MATCH(".he", gasmix, &dive->cylinder[cylinder_index].gasmix.he))
+	if (MATCH(".he", gasmix, &dive->cylinder[cur_cylinder_index].gasmix.he))
 		return;
 
 	nonmatch("dive", name, buf);
@@ -1082,150 +1142,35 @@ static void try_to_fill_dive(struct dive **divep, const char *name, char *buf)
  */
 static void dive_start(void)
 {
-	if (dive)
-		return;
-	dive = alloc_dive();
-	memset(&tm, 0, sizeof(tm));
-}
-
-static void sanitize_gasmix(struct gasmix *mix)
-{
-	unsigned int o2, he;
-
-	o2 = mix->o2.permille;
-	he = mix->he.permille;
-
-	/* Regular air: leave empty */
-	if (!he) {
-		if (!o2)
-			return;
-		/* 20.9% or 21% O2 is just air */
-		if (o2 >= 209 && o2 <= 210) {
-			mix->o2.permille = 0;
-			return;
-		}
-	}
-
-	/* Sane mix? */
-	if (o2 <= 1000 && he <= 1000 && o2+he <= 1000)
+	if (cur_dive)
 		return;
-	fprintf(stderr, "Odd gasmix: %d O2 %d He\n", o2, he);
-	memset(mix, 0, sizeof(*mix));
-}
-
-/*
- * See if the size/workingpressure looks like some standard cylinder
- * size, eg "AL80".
- */
-static void match_standard_cylinder(cylinder_type_t *type)
-{
-	double cuft;
-	int psi, len;
-	const char *fmt;
-	char buffer[20], *p;
-
-	/* Do we already have a cylinder description? */
-	if (type->description)
-		return;
-
-	cuft = ml_to_cuft(type->size.mliter);
-	cuft *= to_ATM(type->workingpressure);
-	psi = to_PSI(type->workingpressure);
-
-	switch (psi) {
-	case 2300 ... 2500:	/* 2400 psi: LP tank */
-		fmt = "LP%d";
-		break;
-	case 2600 ... 2700:	/* 2640 psi: LP+10% */
-		fmt = "LP%d";
-		break;
-	case 2900 ... 3100:	/* 3000 psi: ALx tank */
-		fmt = "AL%d";
-		break;
-	case 3400 ... 3500:	/* 3442 psi: HP tank */
-		fmt = "HP%d";
-		break;
-	case 3700 ... 3850:	/* HP+10% */
-		fmt = "HP%d+";
-		break;
-	default:
-		return;
-	}
-	len = snprintf(buffer, sizeof(buffer), fmt, (int) (cuft+0.5));
-	p = malloc(len+1);
-	if (!p)
-		return;
-	memcpy(p, buffer, len+1);
-	type->description = p;
-}
-
-
-/*
- * There are two ways to give cylinder size information:
- *  - total amount of gas in cuft (depends on working pressure and physical size)
- *  - physical size
- *
- * where "physical size" is the one that actually matters and is sane.
- *
- * We internally use physical size only. But we save the workingpressure
- * so that we can do the conversion if required.
- */
-static void sanitize_cylinder_type(cylinder_type_t *type)
-{
-	double volume_of_air, atm, volume;
-
-	/* If we have no working pressure, it had *better* be just a physical size! */
-	if (!type->workingpressure.mbar)
-		return;
-
-	/* No size either? Nothing to go on */
-	if (!type->size.mliter)
-		return;
-
-	if (input_units.volume == CUFT) {
-		/* confusing - we don't really start from ml but millicuft !*/
-		volume_of_air = cuft_to_l(type->size.mliter);
-		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;
-	}
-
-	/* Ok, we have both size and pressure: try to match a description */
-	match_standard_cylinder(type);
-}
-
-static void sanitize_cylinder_info(struct dive *dive)
-{
-	int i;
-
-	for (i = 0; i < MAX_CYLINDERS; i++) {
-		sanitize_gasmix(&dive->cylinder[i].gasmix);
-		sanitize_cylinder_type(&dive->cylinder[i].type);
-	}
+	cur_dive = alloc_dive();
+	memset(&cur_tm, 0, sizeof(cur_tm));
 }
 
 static void dive_end(void)
 {
-	if (!dive)
+	if (!cur_dive)
 		return;
-	sanitize_cylinder_info(dive);
-	record_dive(dive);
-	dive = NULL;
-	cylinder_index = 0;
-	ws_index = 0;
+	record_dive(cur_dive);
+	cur_dive = NULL;
+	cur_cylinder_index = 0;
+	cur_ws_index = 0;
 }
 
 static void event_start(void)
 {
-	memset(&event, 0, sizeof(event));
-	event.active = 1;
+	memset(&cur_event, 0, sizeof(cur_event));
+	cur_event.active = 1;
 }
 
 static void event_end(void)
 {
-	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;
+	if (cur_event.name && strcmp(cur_event.name, "surface") != 0)
+		add_event(cur_dive, cur_event.time.seconds,
+			cur_event.type, cur_event.flags,
+			cur_event.value, cur_event.name);
+	cur_event.active = 0;
 }
 
 static void cylinder_start(void)
@@ -1234,7 +1179,7 @@ static void cylinder_start(void)
 
 static void cylinder_end(void)
 {
-	cylinder_index++;
+	cur_cylinder_index++;
 }
 
 static void ws_start(void)
@@ -1243,21 +1188,21 @@ static void ws_start(void)
 
 static void ws_end(void)
 {
-	ws_index++;
+	cur_ws_index++;
 }
 
 static void sample_start(void)
 {
-	sample = prepare_sample(&dive);
+	cur_sample = prepare_sample(&cur_dive);
 }
 
 static void sample_end(void)
 {
-	if (!dive)
+	if (!cur_dive)
 		return;
 
-	finish_sample(dive, sample);
-	sample = NULL;
+	finish_sample(cur_dive);
+	cur_sample = NULL;
 }
 
 static void entry(const char *name, int size, const char *raw)
@@ -1268,16 +1213,16 @@ static void entry(const char *name, int size, const char *raw)
 		return;
 	memcpy(buf, raw, size);
 	buf[size] = 0;
-	if (event.active) {
+	if (cur_event.active) {
 		try_to_fill_event(name, buf);
 		return;
 	}
-	if (sample) {
-		try_to_fill_sample(sample, name, buf);
+	if (cur_sample) {
+		try_to_fill_sample(cur_sample, name, buf);
 		return;
 	}
-	if (dive) {
-		try_to_fill_dive(&dive, name, buf);
+	if (cur_dive) {
+		try_to_fill_dive(&cur_dive, name, buf);
 		return;
 	}
 }
@@ -1455,25 +1400,25 @@ static void reset_all(void)
 	import_source = UNKNOWN;
 }
 
-void parse_xml_file(const char *filename, GError **error)
+void parse_xml_buffer(const char *url, const char *buffer, int size, GError **error)
 {
 	xmlDoc *doc;
 
-	doc = xmlReadFile(filename, NULL, 0);
+	doc = xmlReadMemory(buffer, size, url, NULL, 0);
 	if (!doc) {
-		fprintf(stderr, "Failed to parse '%s'.\n", filename);
+		fprintf(stderr, "Failed to parse '%s'.\n", url);
 		if (error != NULL)
 		{
 			*error = g_error_new(g_quark_from_string("subsurface"),
 					     DIVE_ERROR_PARSE,
 					     "Failed to parse '%s'",
-					     filename);
+					     url);
 		}
 		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);
+	set_filename(url);
 	reset_all();
 	dive_start();
 #ifdef XSLT
@@ -1518,7 +1463,11 @@ static xsltStylesheetPtr try_get_stylesheet(const char *path, int len, const cha
 
 static xsltStylesheetPtr get_stylesheet(const char *name)
 {
-	const char *path = xslt_path, *next;
+	const char *path, *next;
+
+	path = getenv("SUBSURFACE_XSLT_PATH");
+	if (!path)
+		path = xslt_path;
 
 	do {
 		int len;