0005608: GEDCOM import ignores leading 0's in INDI ID's

svn: r19055
This commit is contained in:
Tim G L Lyons 2012-03-13 17:45:26 +00:00
parent 9c4f7b7e0a
commit 8c59cddc52

View File

@ -1674,16 +1674,17 @@ class IdMapper(object):
while new_val in self.swap.values(): while new_val in self.swap.values():
new_val = self.find_next() new_val = self.find_next()
else: else:
gid = self.clean(gid) clean_gid = self.clean(gid)
if gid in self.swap: if gid in self.swap:
return self.swap[gid] return self.swap[gid]
else: 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() new_val = self.find_next()
while new_val in self.swap.values(): while new_val in self.swap.values():
new_val = self.find_next() new_val = self.find_next()
else: else:
new_val = gid new_val = clean_gid
self.swap[gid] = new_val self.swap[gid] = new_val
return new_val return new_val