Two more fixes for protecting None.property when using Do Not Include Unlinked records

svn: r15929
This commit is contained in:
Doug Blank
2010-09-25 11:00:25 +00:00
parent ae8ba555eb
commit 3fb1e0fd4a

View File

@@ -609,6 +609,8 @@ class GedcomWriter(UpdateCallback):
""" """
for event_ref in person.get_event_ref_list(): for event_ref in person.get_event_ref_list():
event = self.dbase.get_event_from_handle(event_ref.ref) event = self.dbase.get_event_from_handle(event_ref.ref)
if event is None:
continue
etype = int(event.get_type()) etype = int(event.get_type())
# if the event is a birth or death, skip it. # if the event is a birth or death, skip it.
@@ -1106,13 +1108,14 @@ class GedcomWriter(UpdateCallback):
""" """
if event_ref: if event_ref:
event = self.dbase.get_event_from_handle(event_ref.ref) event = self.dbase.get_event_from_handle(event_ref.ref)
if event_has_subordinate_data(event, event_ref): if event:
self.__writeln(1, key) if event_has_subordinate_data(event, event_ref):
else: self.__writeln(1, key)
self.__writeln(1, key, 'Y') else:
if event.get_description().strip() != "": self.__writeln(1, key, 'Y')
self.__writeln(2, 'TYPE', event.get_description()) if event.get_description().strip() != "":
self.__dump_event_stats(event, event_ref) self.__writeln(2, 'TYPE', event.get_description())
self.__dump_event_stats(event, event_ref)
def __change(self, timeval, level): def __change(self, timeval, level):
""" """