X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=parse-xml.c;h=49402338746c3d3423b65479583eecc802930210;hb=e7a70b6ae821e6a178957e2814406ac387b990ea;hp=e920a11f6f0d798b18900ccb23317c95c8ec5162;hpb=81fddfa67e779c8d378eee4c57fd9f201e15f96f;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index e920a11..4940233 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)