From 54957e0a21fe270f7f35b3d378db24a6148779a1 Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Wed, 19 Apr 2006 04:06:27 +0000 Subject: [PATCH] Update for RelLib changes svn: r6361 --- ChangeLog | 4 ++++ src/plugins/FamilyGroup.py | 12 ++++++------ src/plugins/IndivComplete.py | 27 ++++++++++++++++++--------- 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 20f9877a0..2e7fe6df5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-04-18 Brian Matherly + * src/plugins/FamilyGroup.py: update for RelLib changes + * src/plugins/IndivComplete.py: update for RelLib changes + 2006-04-18 Don Allingham * src/GrampsDb/_ReadXML.py: new types * src/GrampsDb/_ConstXML.py: new types diff --git a/src/plugins/FamilyGroup.py b/src/plugins/FamilyGroup.py index 70124b3f9..11fd36c6f 100644 --- a/src/plugins/FamilyGroup.py +++ b/src/plugins/FamilyGroup.py @@ -320,7 +320,7 @@ class FamilyGroup(Report.Report): if self.incParNames: for alt_name in person.get_alternate_names(): - type = Utils.format_name_type( alt_name.get_type() ) + type = str( alt_name.get_type() ) name = alt_name.get_regular_name() self.dump_parent_line(type,name) @@ -538,7 +538,7 @@ class FamilyGroup(Report.Report): self.dump_parent(_("Wife"),family.get_mother_handle()) - length = len(family.get_child_handle_list()) + length = len(family.get_child_ref_list()) if length > 0: self.doc.start_paragraph("FGR-blank") self.doc.end_paragraph() @@ -551,14 +551,14 @@ class FamilyGroup(Report.Report): self.doc.end_cell() self.doc.end_row() index = 1 - for child_handle in family.get_child_handle_list(): - self.dump_child(index,child_handle) + for child_ref in family.get_child_ref_list(): + self.dump_child(index,child_ref.ref) index = index + 1 self.doc.end_table() if self.recursive: - for child_handle in family.get_child_handle_list(): - child = self.database.get_person_from_handle(child_handle) + for child_ref in family.get_child_ref_list(): + child = self.database.get_person_from_handle(child_ref.ref) for child_family_handle in child.get_family_handle_list(): if child_family_handle != family_handle: self.doc.page_break() diff --git a/src/plugins/IndivComplete.py b/src/plugins/IndivComplete.py index b4b18906d..955b78eee 100644 --- a/src/plugins/IndivComplete.py +++ b/src/plugins/IndivComplete.py @@ -196,18 +196,28 @@ class IndivCompleteReport(Report.Report): self.doc.end_cell() self.doc.end_row() - for (family_handle,mrel,frel) \ - in self.start_person.get_parent_family_handle_list(): + family_handle_list = self.start_person.get_parent_family_handle_list() + for family_handle in family_handle_list: if family_handle == \ self.start_person.get_main_parents_family_handle(): continue family = self.database.get_family_from_handle(family_handle) + + # Get the mother and father relationships + frel = "" + mrel = "" + child_handle = self.start_person.get_handle() + child_ref_list = family.get_child_ref_list() + for child_ref in child_ref_list: + if child_ref.ref == child_handle: + frel = str(child_ref.get_father_relation()) + mrel = str(child_ref.get_mother_relation()) + father_handle = family.get_father_handle() if father_handle: father = self.database.get_person_from_handle(father_handle) fname = father.get_primary_name().get_regular_name() - frel = const.child_relations.find_value(frel) self.write_p_entry(_('Father'),fname,frel) else: self.write_p_entry(_('Father'),'','') @@ -216,7 +226,6 @@ class IndivCompleteReport(Report.Report): if mother_handle: mother = self.database.get_person_from_handle(mother_handle) fname = mother.get_primary_name().get_regular_name() - frel = const.child_relations.find_value(frel) self.write_p_entry(_('Mother'),fname,frel) else: self.write_p_entry(_('Mother'),'','') @@ -240,7 +249,7 @@ class IndivCompleteReport(Report.Report): self.doc.end_row() for name in self.start_person.get_alternate_names(): - type = Utils.format_name_type( name.get_type() ) + type = str( name.get_type() ) self.doc.start_row() self.normal_cell(type) text = name.get_regular_name() @@ -294,8 +303,8 @@ class IndivCompleteReport(Report.Report): event = self.database.get_event_from_handle(event_ref.ref) self.write_fact(event) - child_handle_list = family.get_child_handle_list() - if len(child_handle_list): + child_ref_list = family.get_child_ref_list() + if len(child_ref_list): self.doc.start_row() self.normal_cell(_("Children")) @@ -303,12 +312,12 @@ class IndivCompleteReport(Report.Report): self.doc.start_paragraph("IDS-Normal") first = 1 - for child_handle in child_handle_list: + for child_ref in child_ref_list: if first == 1: first = 0 else: self.doc.write_text('\n') - child = self.database.get_person_from_handle(child_handle) + child = self.database.get_person_from_handle(child_ref.ref) self.doc.write_text( child.get_primary_name().get_regular_name()) self.doc.end_paragraph()