From 4e7137569fa973e70772acc221fbd400bfdba644 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Tue, 13 Mar 2012 17:47:06 +0000 Subject: [PATCH] 0005608: GEDCOM import ignores leading 0's in INDI ID's svn: r19056 --- src/plugins/lib/libgedcom.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/lib/libgedcom.py b/src/plugins/lib/libgedcom.py index b775d176b..028fd6e27 100644 --- a/src/plugins/lib/libgedcom.py +++ b/src/plugins/lib/libgedcom.py @@ -1674,16 +1674,17 @@ class IdMapper(object): while new_val in self.swap.values(): new_val = self.find_next() else: - gid = self.clean(gid) + clean_gid = self.clean(gid) if gid in self.swap: return self.swap[gid] else: - if self.trans.get(str(gid)) or (gid in self.swap.values()): + if self.trans.get(str(clean_gid)) or \ + (clean_gid in self.swap.values()): new_val = self.find_next() while new_val in self.swap.values(): new_val = self.find_next() else: - new_val = gid + new_val = clean_gid self.swap[gid] = new_val return new_val