X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=parse-xml.c;h=a71ff235b4043bef4b9a8c296f3b91721f7e1f68;hb=6538e5bba00b51a7253b6cff927c8774f1b39e2b;hp=4fd4dcfe6415f1495c414b05a69785579355a821;hpb=d1b30212ff7192ef1b3fa85924433a8ddd92c281;p=ext%2Fsubsurface.git

diff --git a/parse-xml.c b/parse-xml.c
index 4fd4dcf..a71ff23 100644
--- a/parse-xml.c
+++ b/parse-xml.c
@@ -609,7 +609,8 @@ static void divinglog_place(char *place, void *_location)
 
 static int divinglog_dive_match(struct dive *dive, const char *name, int len, char *buf)
 {
-	return	MATCH(".divedate", divedate, &dive->when) ||
+	return	MATCH(".id", get_index, &dive->nr) ||
+		MATCH(".divedate", divedate, &dive->when) ||
 		MATCH(".entrytime", divetime, &dive->when) ||
 		MATCH(".depth", depth, &dive->maxdepth) ||
 		MATCH(".tanksize", cylindersize, &dive->cylinder[0].type.size) ||
@@ -876,6 +877,8 @@ static void try_to_fill_dive(struct dive *dive, const char *name, char *buf)
 		break;
 	}
 
+	if (MATCH(".nr", get_index, &dive->nr))
+		return;
 	if (MATCH(".date", divedate, &dive->when))
 		return;
 	if (MATCH(".time", divetime, &dive->when))