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

Merge pull request #195 from prculley/bug9579_42

Browse Source 
bug 9579 Gedcom import of FTM file with OCCU record crashes import
This commit is contained in:
Doug Blank 2016-07-16 11:22:22 -04:00 committed by GitHub
commit e53df38c8a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/plugins/lib/libgedcom.py
View File

@ -5417,8 +5417,9 @@ class GedcomParser(UpdateCallback):
@type state: CurrentState @type state: CurrentState
""" """
if self.is_ftw and state.event.type in FTW_BAD_PLACE: if self.is_ftw and (state.event.type in FTW_BAD_PLACE) \
state.event.set_description(line.data) and not state.event.get_description():
state.event.set_description(line.data)
else: else:
title = line.data title = line.data
place = state.place place = state.place
@ -5448,8 +5449,8 @@ class GedcomParser(UpdateCallback):
state.msg += sub_state.msg state.msg += sub_state.msg
if sub_state.pf: # if we found local PLAC:FORM if sub_state.pf: # if we found local PLAC:FORM
state.pf = sub_state.pf # save to override global value state.pf = sub_state.pf # save to override global value
# merge notes etc into place # merge notes etc into place
state.place.merge(sub_state.place) state.place.merge(sub_state.place)
def __event_place_note(self, line, state): def __event_place_note(self, line, state):
""" """