From 53716bdca0506d09fc344ed011d08a303bf225ff Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Mon, 18 May 2009 14:02:13 +0000 Subject: [PATCH] 2942: Note in Family eventref not referenced, also source of attribute of family eventref svn: r12535 --- src/gen/lib/attribute.py | 12 +++++++++++- src/gen/lib/family.py | 9 +++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/gen/lib/attribute.py b/src/gen/lib/attribute.py index 70748d550..4de7cde04 100644 --- a/src/gen/lib/attribute.py +++ b/src/gen/lib/attribute.py @@ -100,12 +100,22 @@ class Attribute(SecondaryObject, PrivacyBase, SourceBase, NoteBase): """ return self.source_list + def get_note_child_list(self): + """ + Return the list of child secondary objects that may refer notes. + + @return: Returns the list of child secondary child objects that may + refer notes. + @rtype: list + """ + return self.source_list + def get_handle_referents(self): """ Return the list of child objects which may, directly or through their children, reference primary objects. - @return: Returns the list of objects refereincing primary objects. + @return: Returns the list of objects referencing primary objects. @rtype: list """ return self.source_list diff --git a/src/gen/lib/family.py b/src/gen/lib/family.py index bdafcaa85..5e0118256 100644 --- a/src/gen/lib/family.py +++ b/src/gen/lib/family.py @@ -258,7 +258,8 @@ class Family(SourceBase, NoteBase, MediaBase, AttributeBase, LdsOrdBase, @rtype: list """ check_list = self.media_list + self.attribute_list + \ - self.lds_ord_list + self.child_ref_list + self.lds_ord_list + self.child_ref_list + \ + self.event_ref_list return check_list def get_note_child_list(self): @@ -270,7 +271,8 @@ class Family(SourceBase, NoteBase, MediaBase, AttributeBase, LdsOrdBase, @rtype: list """ check_list = self.media_list + self.attribute_list + \ - self.lds_ord_list + self.child_ref_list + self.source_list + self.lds_ord_list + self.child_ref_list + self.source_list + \ + self.event_ref_list return check_list def get_referenced_handles(self): @@ -282,7 +284,6 @@ class Family(SourceBase, NoteBase, MediaBase, AttributeBase, LdsOrdBase, @rtype: list """ ret = self.get_referenced_note_handles() - ret += [('Event', ref.ref) for ref in self.event_ref_list] ret += [('Person', handle) for handle in ([ref.ref for ref in self.child_ref_list] + [self.father_handle, self.mother_handle]) @@ -297,7 +298,7 @@ class Family(SourceBase, NoteBase, MediaBase, AttributeBase, LdsOrdBase, @return: Returns the list of objects refereincing primary objects. @rtype: list """ - return self.get_sourcref_child_list() + self.source_list + return self.get_sourcref_child_list() + self.source_list def set_relationship(self, relationship_type): """