0005608: GEDCOM import ignores leading 0's in INDI ID's
svn: r19056
This commit is contained in:
parent
73be67b3f8
commit
4e7137569f
@ -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
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user