Merge pull request #151 from prculley/bug9430m

Bug 9430 GEDCOM import PLAC or ADDR attached Notes etc. are lost
This commit is contained in:
Sam Manzi 2016-05-13 09:08:47 +10:00
commit 05dcde4c8e

View File

@ -5437,6 +5437,8 @@ class GedcomParser(UpdateCallback):
self.__parse_level(sub_state, self.event_place_map, self.__parse_level(sub_state, self.event_place_map,
self.__undefined) self.__undefined)
state.msg += sub_state.msg state.msg += sub_state.msg
# merge notes etc into place
state.place.merge(sub_state.place)
def __event_place_note(self, line, state): def __event_place_note(self, line, state):
""" """
@ -5595,7 +5597,7 @@ class GedcomParser(UpdateCallback):
place.set_type((PlaceType.CUSTOM, _("Address"))) place.set_type((PlaceType.CUSTOM, _("Address")))
# merge notes etc into place # merge notes etc into place
place.merge(sub_state.place) state.place.merge(sub_state.place)
def __add_location(self, place, location): def __add_location(self, place, location):
""" """