Merge pull request #126 from prculley/bug8809

Bug 8809 Multiple GEDCOM imports creates duplicate event IDs
This commit is contained in:
Doug Blank 2016-05-05 13:22:57 -04:00
commit c3e0d8c7c0

5
gramps/plugins/lib/libgedcom.py Normal file → Executable file
View File

@ -1750,10 +1750,11 @@ class IdFinder(object):
@rtype: str @rtype: str
""" """
index = self.prefix % self.index index = self.prefix % self.index
while str(index) in self.ids: # self.ids contains 'bytes' data
while index.encode('utf-8') in self.ids:
self.index += 1 self.index += 1
index = self.prefix % self.index index = self.prefix % self.index
self.ids.add(index) self.ids.add(index.encode('utf-8'))
self.index += 1 self.index += 1
return index return index