diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index de910b7ce..b50d944c8 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,11 @@ +2006-11-21 Brian Matherly + * src/plugins/DetDescendantReport.py: 0000558: Print only primary events + * src/plugins/DetAncestralReport.py: 0000558: Print only primary events + * src/plugins/GraphViz.py: 0000558: Print only primary events + * src/plugins/FamilyGroup.py: 0000558: Print only primary events + * src/plugins/IndivComplete.py: 0000558: Print only primary events + * src/plugins/NarrativeWeb.py: 0000558: Print only primary events + 2006-11-21 Don Allingham * src/GrampsDb/_ReadGedcom.py: handle illegal fullname gedcoms produced by FTM * src/GrampsDb/_GedTokens.py: handle illegal fullname gedcoms produced by FTM diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 7b6eb2344..603bbba82 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -297,7 +297,7 @@ class DetAncestorReport(Report): if self.includeEvents: birth_ref = person.get_birth_ref() death_ref = person.get_death_ref() - for event_ref in person.get_event_ref_list(): + for event_ref in person.get_primary_event_ref_list(): if event_ref == birth_ref or event_ref == death_ref: continue @@ -502,7 +502,7 @@ class DetAncestorReport(Report): person_mark = ReportUtils.get_person_mark(self.database,ind) firstName = ReportUtils.common_name(ind,self.usecall) - for event_ref in ind.get_event_ref_list(): + for event_ref in ind.get_primary_event_ref_list(): event = self.database.get_event_from_handle(event_ref.ref) if event: etype = event.get_type() diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index 268267db8..5bf8d8d18 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -325,7 +325,7 @@ class DetDescendantReport(Report): if self.includeEvents: birth_ref = person.get_birth_ref() death_ref = person.get_death_ref() - for event_ref in person.get_event_ref_list(): + for event_ref in person.get_primary_event_ref_list(): if event_ref == birth_ref or event_ref == death_ref: continue @@ -535,7 +535,7 @@ class DetDescendantReport(Report): person_mark = ReportUtils.get_person_mark(self.database,ind) firstName = ReportUtils.common_name(ind,self.usecall) - for event_ref in ind.get_event_ref_list(): + for event_ref in ind.get_primary_event_ref_list(): event = self.database.get_event_from_handle(event_ref.ref) if event: etype = event.get_type() diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index c995c4112..962dba17a 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -328,7 +328,7 @@ class FamilyGroup(Report): self.dump_parent_parents(person) if self.incParEvents: - for event_ref in person.get_event_ref_list(): + for event_ref in person.get_primary_event_ref_list(): if event_ref != birth_ref and event_ref != death_ref: event = self.database.get_event_from_handle(event_ref.ref) evtType = event.get_type() diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py index 4fd5676c8..4ead6bda7 100644 --- a/gramps2/src/plugins/GraphViz.py +++ b/gramps2/src/plugins/GraphViz.py @@ -522,7 +522,7 @@ just use iconv: if birth and death: return (birth, death) # missing info, use (first) christening/burial instead - for event_ref in person.get_event_ref_list(): + for event_ref in person.get_primary_event_ref_list(): event = self.database.get_event_from_handle(event_ref.ref) if int(event.get_type()) == RelLib.EventType.CHRISTEN: if not birth: diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 1b5ee8b4b..ab3875c30 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -378,7 +378,7 @@ class IndivCompleteReport(Report): self.doc.end_cell() self.doc.end_row() - event_ref_list = self.start_person.get_event_ref_list() + event_ref_list = self.start_person.get_primary_event_ref_list() for event_ref in event_ref_list: if event_ref: event = self.database.get_event_from_handle(event_ref.ref) diff --git a/gramps2/src/plugins/NarrativeWeb.py b/gramps2/src/plugins/NarrativeWeb.py index 4174f80a2..c1ed5a0cc 100644 --- a/gramps2/src/plugins/NarrativeWeb.py +++ b/gramps2/src/plugins/NarrativeWeb.py @@ -1383,7 +1383,7 @@ class IndividualPage(BasePage): media_list += ReportUtils.sanitize_media_ref_list( db, event.get_media_list(), self.exclude_private ) - for evt_ref in self.person.get_event_ref_list(): + for evt_ref in self.person.get_primary_event_ref_list(): event = self.db.get_event_from_handle(evt_ref.ref) if event: media_list += ReportUtils.sanitize_media_ref_list( db, @@ -1652,7 +1652,7 @@ class IndividualPage(BasePage): def display_ind_events(self,of): birth_ref = self.person.get_birth_ref() death_ref = self.person.get_death_ref() - evt_ref_list = self.person.get_event_ref_list() + evt_ref_list = self.person.get_primary_event_ref_list() if not birth_ref and not death_ref and not evt_ref_list: return