Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2008-02-20 Raphael Ackermann <raphael.ackermann@gmail.com>

Browse Source 
* src/GrampsDbUtils/_GedcomUtils.py: (IdMapper.get_translate()) return 
	value of dict instead of boolean. Fix #0001708

svn: r10084
This commit is contained in:
Raphael Ackermann 2008-02-21 00:34:04 +00:00
parent 5438b86c87
commit 5cd3411cfd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-02-20 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/GrampsDbUtils/_GedcomUtils.py: (IdMapper.get_translate()) return
value of dict instead of boolean. Fix #0001708
2008-02-20 Frederik De Richter <frederik.de.richter@pandora.be> 2008-02-20 Frederik De Richter <frederik.de.richter@pandora.be>
* src/Merge/_MergePerson.py * src/Merge/_MergePerson.py
* src/Merge/_MergeSource.py * src/Merge/_MergeSource.py

9
src/GrampsDbUtils/_GedcomUtils.py
View File

@ -35,11 +35,11 @@ SURNAME_RE = re.compile(r"/([^/]*)/([^/]*)")
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class CurrentState: class CurrentState:
""" """
Keeps track of the current state variables Keep track of the current state variables.
""" """
def __init__(self, person=None, level=0, event=None, event_ref=None): def __init__(self, person=None, level=0, event=None, event_ref=None):
""" """
Initializes the object Initialize the object.
""" """
self.name_cnt = 0 self.name_cnt = 0
self.person = person self.person = person
@ -183,9 +183,8 @@ class IdMapper:
def get_translate(self, gid): def get_translate(self, gid):
gid = self.clean(gid) gid = self.clean(gid)
new_id = self.swap.has_key(gid) if self.swap.has_key(gid):
if new_id: return self.swap[gid]
return new_id
else: else:
if self.trans.get(str(gid)): if self.trans.get(str(gid)):
new_val = self.find_next() new_val = self.find_next()