From ca1c4fe042fffcc18a4b981f9f15a7e8901648d2 Mon Sep 17 00:00:00 2001 From: Alex Roitman Date: Sat, 21 Aug 2004 18:56:01 +0000 Subject: [PATCH] * src/AddSpouse.py, src/ChooseParents.py, src/EditPerson.py, src/EditPlace.py, src/EditSource.py, src/EventEdit.py, src/FamilyView.py, src/GenericFilter.py, src/Marriage.py, src/PedView.py, src/PeopleModel.py, src/PlaceView.py, src/RelLib.py, src/SelectChild.py, src/Sort.py, src/SourceView.py, src/SubstKeywords.py, src/WriteGedcom.py, src/WriteXML.py, src/plugins/AncestorReport.py, src/plugins/Ancestors.py, src/plugins/ChangeTypes.py, src/plugins/DescendReport.py, src/plugins/DetDescendantReport.py, src/plugins/EventCmp.py, src/plugins/FamilyGroup.py, src/plugins/FanChart.py, src/plugins/FtmStyleAncestors.py, src/plugins/FtmStyleDescendants.py, src/plugins/GraphViz.py, src/plugins/IndivComplete.py, src/plugins/IndivSummary.py, src/plugins/Merge.py, src/plugins/RelCalc.py, src/plugins/RelGraph.py, src/plugins/Summary.py, src/plugins/TimeLine.py, src/plugins/Verify.py, src/plugins/WebPage.py, src/plugins/WriteCD.py, src/plugins/WritePkg.py, src/plugins/DetAncestralReport.py: Use get_event_from_handle (not find_ ). svn: r3462 --- gramps2/ChangeLog | 19 +++++++++++++++++++ gramps2/src/AddSpouse.py | 10 ++++------ gramps2/src/ChooseParents.py | 8 ++++---- gramps2/src/EditPerson.py | 16 ++++++++-------- gramps2/src/EditPlace.py | 8 ++++---- gramps2/src/EditSource.py | 6 +++--- gramps2/src/EventEdit.py | 2 +- gramps2/src/FamilyView.py | 10 +++++----- gramps2/src/GenericFilter.py | 8 ++++---- gramps2/src/Marriage.py | 2 +- gramps2/src/PedView.py | 8 ++++---- gramps2/src/PeopleModel.py | 8 ++++---- gramps2/src/PlaceView.py | 4 ++-- gramps2/src/RelLib.py | 14 +++++++------- gramps2/src/SelectChild.py | 8 ++++---- gramps2/src/Sort.py | 8 ++++---- gramps2/src/SourceView.py | 4 ++-- gramps2/src/SubstKeywords.py | 6 +++--- gramps2/src/WriteGedcom.py | 12 ++++++------ gramps2/src/WriteXML.py | 8 ++++---- gramps2/src/plugins/AncestorReport.py | 6 +++--- gramps2/src/plugins/Ancestors.py | 16 ++++++++-------- gramps2/src/plugins/ChangeTypes.py | 2 +- gramps2/src/plugins/DescendReport.py | 4 ++-- gramps2/src/plugins/DetAncestralReport.py | 14 +++++++------- gramps2/src/plugins/DetDescendantReport.py | 14 +++++++------- gramps2/src/plugins/EventCmp.py | 10 +++++----- gramps2/src/plugins/FamilyGroup.py | 10 +++++----- gramps2/src/plugins/FanChart.py | 4 ++-- gramps2/src/plugins/FtmStyleAncestors.py | 12 ++++++------ gramps2/src/plugins/FtmStyleDescendants.py | 18 +++++++++--------- gramps2/src/plugins/GraphViz.py | 6 +++--- gramps2/src/plugins/IndivComplete.py | 4 ++-- gramps2/src/plugins/IndivSummary.py | 4 ++-- gramps2/src/plugins/Merge.py | 8 ++++---- gramps2/src/plugins/RelCalc.py | 2 +- gramps2/src/plugins/RelGraph.py | 6 +++--- gramps2/src/plugins/Summary.py | 2 +- gramps2/src/plugins/TimeLine.py | 8 ++++---- gramps2/src/plugins/Verify.py | 6 +++--- gramps2/src/plugins/WebPage.py | 10 +++++----- gramps2/src/plugins/WriteCD.py | 2 +- gramps2/src/plugins/WritePkg.py | 2 +- 43 files changed, 178 insertions(+), 161 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 2481cde63..28ded0446 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -7,6 +7,25 @@ * src/Sources.py (draw): Correctly sort, use gramps id when displaying sources; (redraw): Use gramps id in the list view. + * src/AddSpouse.py, src/ChooseParents.py, src/EditPerson.py, + src/EditPlace.py, src/EditSource.py, src/EventEdit.py, + src/FamilyView.py, src/GenericFilter.py, + src/Marriage.py, src/PedView.py, src/PeopleModel.py, + src/PlaceView.py, src/RelLib.py, src/SelectChild.py, + src/Sort.py, src/SourceView.py, src/SubstKeywords.py, + src/WriteGedcom.py, src/WriteXML.py, src/plugins/AncestorReport.py, + src/plugins/Ancestors.py, src/plugins/ChangeTypes.py, + src/plugins/DescendReport.py, src/plugins/DetDescendantReport.py, + src/plugins/EventCmp.py, src/plugins/FamilyGroup.py, + src/plugins/FanChart.py, src/plugins/FtmStyleAncestors.py, + src/plugins/FtmStyleDescendants.py, src/plugins/GraphViz.py, + src/plugins/IndivComplete.py, src/plugins/IndivSummary.py, + src/plugins/Merge.py, src/plugins/RelCalc.py, src/plugins/RelGraph.py, + src/plugins/Summary.py, src/plugins/TimeLine.py, src/plugins/Verify.py, + src/plugins/WebPage.py, src/plugins/WriteCD.py, + src/plugins/WritePkg.py, src/plugins/DetAncestralReport.py: + Use get_event_from_handle (not find_ ). + 2004-08-20 Don Allingham * src/gramps_main.py: update family display after EditPerson * src/EditPerson.py: fix callback diff --git a/gramps2/src/AddSpouse.py b/gramps2/src/AddSpouse.py index edebeef1c..8e782c74a 100644 --- a/gramps2/src/AddSpouse.py +++ b/gramps2/src/AddSpouse.py @@ -93,15 +93,13 @@ class AddSpouse: birth_handle = self.person.get_birth_handle() death_handle = self.person.get_death_handle() - self.bday = self.db.find_event_from_handle(birth_handle) - self.dday = self.db.find_event_from_handle(death_handle) if birth_handle: - self.bday = self.db.find_event_from_handle(birth_handle).get_date_object() + self.bday = self.db.get_event_from_handle(birth_handle).get_date_object() else: self.bday = Date.Date() if death_handle: - self.dday = self.db.find_event_from_handle(death_handle).get_date_object() + self.dday = self.db.get_event_from_handle(death_handle).get_date_object() else: self.dday = Date.Date() @@ -296,12 +294,12 @@ class AddSpouse: pb_id = person.get_birth_handle() if pd_id: - pdday = self.db.find_event_from_handle(pd_id).get_date_object() + pdday = self.db.get_event_from_handle(pd_id).get_date_object() else: pdday = Date.Date() if pb_id: - pbday = self.db.find_event_from_handle(pb_id).get_date_object() + pbday = self.db.get_event_from_handle(pb_id).get_date_object() else: pbday = Date.Date() diff --git a/gramps2/src/ChooseParents.py b/gramps2/src/ChooseParents.py index 265fa0523..5c35680b8 100644 --- a/gramps2/src/ChooseParents.py +++ b/gramps2/src/ChooseParents.py @@ -96,13 +96,13 @@ class ChooseParents: self.father_filter = self.likely_father_filter self.mother_filter = self.likely_mother_filter - birth_event = self.db.find_event_from_handle(self.person.get_birth_handle()) + birth_event = self.db.get_event_from_handle(self.person.get_birth_handle()) if birth_event: self.bday = birth_event.get_date_object() else: self.bday = None - death_event = self.db.find_event_from_handle(self.person.get_death_handle()) + death_event = self.db.get_event_from_handle(self.person.get_death_handle()) if death_event: self.dday = death_event.get_date_object() else: @@ -264,13 +264,13 @@ class ChooseParents: def likely_filter(self,person): if person.get_handle() == self.person.get_handle(): return 0 - birth_event = self.db.find_event_from_handle(person.get_birth_handle()) + birth_event = self.db.get_event_from_handle(person.get_birth_handle()) if birth_event: pbday = birth_event.get_date_object() else: pbday = None - death_event = self.db.find_event_from_handle(person.get_death_handle()) + death_event = self.db.get_event_from_handle(person.get_death_handle()) if death_event: pdday = death_event.get_date_object() else: diff --git a/gramps2/src/EditPerson.py b/gramps2/src/EditPerson.py index a55a895f7..1fac29937 100644 --- a/gramps2/src/EditPerson.py +++ b/gramps2/src/EditPerson.py @@ -210,8 +210,8 @@ class EditPerson: self.gallery_label = self.get_widget("gallery_label") self.lds_tab = self.get_widget("lds_tab") - self.orig_birth = self.db.find_event_from_handle(person.get_birth_handle()) - self.orig_death = self.db.find_event_from_handle(person.get_death_handle()) + self.orig_birth = self.db.get_event_from_handle(person.get_birth_handle()) + self.orig_death = self.db.get_event_from_handle(person.get_death_handle()) self.death = RelLib.Event(self.orig_death) self.birth = RelLib.Event(self.orig_birth) self.pname = RelLib.Name(person.get_primary_name()) @@ -893,7 +893,7 @@ class EditPerson: self.etree.clear() self.emap = {} for event_handle in self.elist: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) pname = place_title(self.db,event) node = self.etree.add([const.display_pevent(event.get_name()),event.get_description(), event.get_quote_date(),pname],event) @@ -1255,7 +1255,7 @@ class EditPerson: store,node = obj.get_selected() if node: row = store.get_path(node) - event = self.db.find_event_from_handle(self.elist[row[0]]) + event = self.db.get_event_from_handle(self.elist[row[0]]) self.event_date_field.set_text(event.get_date()) self.event_place_field.set_text(place_title(self.db,event)) self.event_name_field.set_text(const.display_pevent(event.get_name())) @@ -1770,7 +1770,7 @@ class EditPerson: child_handle = list[i] child = self.db.get_person_from_handle(child_handle) if child.get_birth_handle(): - event = self.db.find_event_from_handle(child.get_birth_handle()) + event = self.db.get_event_from_handle(child.get_birth_handle()) bday = event.get_date_object() child_date = Sort.build_sort_date(bday) else: @@ -1792,7 +1792,7 @@ class EditPerson: # Build the person's date string once event_handle = person.get_birth_handle() if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) person_bday = Sort.build_sort_date(event.get_date_object()) else: person_bday = "99999999" @@ -1805,7 +1805,7 @@ class EditPerson: other = self.db.get_person_from_handle(list[i]) event_handle = other.get_birth_handle() if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) other_bday = Sort.build_sort_date(event.get_date_object()) if (other_bday == "99999999"): continue; @@ -1820,7 +1820,7 @@ class EditPerson: other = self.db.get_person_from_handle(list[i]) event_handle = other.get_birth_handle() if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) other_bday = Sort.build_sort_date(event.get_date_object()) if (other_bday == "99999999"): continue; diff --git a/gramps2/src/EditPlace.py b/gramps2/src/EditPlace.py index bfc7687ba..13aebc5a0 100644 --- a/gramps2/src/EditPlace.py +++ b/gramps2/src/EditPlace.py @@ -480,13 +480,13 @@ class EditPlace: for key in self.db.get_person_handles(sort_handles=False): p = self.db.get_person_from_handle(key) for event_handle in [p.get_birth_handle(), p.get_death_handle()] + p.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event and event.get_place_handle() == self.place: pevent.append((p,event)) for family_handle in self.db.get_family_handles(): f = self.db.get_family_from_handle(family_handle) for event_handle in f.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event and event.get_place_handle() == self.place: fevent.append((f,event)) @@ -562,7 +562,7 @@ class DeletePlaceQuery: for key in self.db.get_person_handles(sort_handles=False): p = self.db.get_person_from_handle(key) for event_handle in [p.get_birth_handle(), p.get_death_handle()] + p.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event and event.get_place_handle() == self.place.get_handle(): event.set_place_handle(None) self.db.commit_event(event,trans) @@ -570,7 +570,7 @@ class DeletePlaceQuery: for fid in self.db.get_family_handles(): f = self.db.get_family_from_handle(fid) for event_handle in f.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event and event.get_place_handle() == self.place.get_handle(): event.set_place_handle(None) self.db.commit_event(event,trans) diff --git a/gramps2/src/EditSource.py b/gramps2/src/EditSource.py index 5377d15e1..8e11b5b5e 100644 --- a/gramps2/src/EditSource.py +++ b/gramps2/src/EditSource.py @@ -240,7 +240,7 @@ class EditSource: else: name = GrampsCfg.get_nameof()(m) for v_id in p.get_event_list(): - v = self.db.find_event_from_handle(v_id) + v = self.db.get_event_from_handle(v_id) if not v: continue for sref in v.get_source_references(): @@ -375,7 +375,7 @@ class DelSrcQuery: commit = 0 p = self.db.get_person_from_handle(key) for v_id in p.get_event_list() + [p.get_birth_handle(), p.get_death_handle()]: - v = self.db.find_event_from_handle(v_id) + v = self.db.get_event_from_handle(v_id) if v: commit += self.delete_source(v) @@ -394,7 +394,7 @@ class DelSrcQuery: commit = 0 p = self.db.get_family_from_handle(p_id) for v_id in p.get_event_list(): - v = self.db.find_event_from_handle(v_id) + v = self.db.get_event_from_handle(v_id) if v: commit += self.delete_source(v) diff --git a/gramps2/src/EventEdit.py b/gramps2/src/EventEdit.py index 31fea290a..c6debcdd4 100644 --- a/gramps2/src/EventEdit.py +++ b/gramps2/src/EventEdit.py @@ -294,7 +294,7 @@ class EventEditor: text = strip(unicode(field.get_text())) if text: if self.pmap.has_key(text): - return self.parent.db.find_event_from_handle(self.pmap[text]) + return self.parent.db.get_event_from_handle(self.pmap[text]) else: return None else: diff --git a/gramps2/src/FamilyView.py b/gramps2/src/FamilyView.py index 3505e2795..99cf61fc2 100644 --- a/gramps2/src/FamilyView.py +++ b/gramps2/src/FamilyView.py @@ -867,8 +867,8 @@ class FamilyView: self.clear() return - bd = self.parent.db.find_event_from_handle(self.person.get_birth_handle()) - dd = self.parent.db.find_event_from_handle(self.person.get_death_handle()) + bd = self.parent.db.get_event_from_handle(self.person.get_birth_handle()) + dd = self.parent.db.get_event_from_handle(self.person.get_death_handle()) if bd and dd: n = "%s [%s]\n\t%s %s\n\t%s %s " % (GrampsCfg.get_nameof()(self.person), @@ -950,7 +950,7 @@ class FamilyView: def find_marriage(self,family): for event_handle in family.get_event_list(): if event_handle: - event = self.parent.db.find_event_from_handle(event_handle) + event = self.parent.db.get_event_from_handle(event_handle) if event.get_name() == "Marriage": return event return None @@ -1051,7 +1051,7 @@ class FamilyView: val = child.get_display_info() i += 1 - event = self.parent.db.find_event_from_handle(val[3]) + event = self.parent.db.get_event_from_handle(val[3]) if event: dval = event.get_date() else: @@ -1416,7 +1416,7 @@ class FamilyView: child_handle = list[i] child = self.parent.db.get_person_from_handle(child_handle) birth_handle = child.get_birth_handle() - birth = self.parent.db.find_event_from_handle(birth_handle) + birth = self.parent.db.get_event_from_handle(birth_handle) if not birth: continue bday = birth.get_date_object() diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index c5aed4a2c..8760a703e 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -971,7 +971,7 @@ class HasEvent(Rule): for event_handle in p.get_event_list(): if not event_handle: continue - event = db.find_event_from_handle(event_handle) + event = db.get_event_from_handle(event_handle) val = 1 if self.list[0] and event.get_name() != self.list[0]: val = 0 @@ -1027,7 +1027,7 @@ class HasFamilyEvent(Rule): for event_handle in f.get_event_list(): if not event_handle: continue - event = db.find_event_from_handle(event_handle) + event = db.get_event_from_handle(event_handle) val = 1 if self.list[0] and event.get_name() != self.list[0]: val = 0 @@ -1137,7 +1137,7 @@ class HasBirth(Rule): event_handle = p.get_birth_handle() if not event_handle: return 0 - event = db.find_event_from_handle(event_handle) + event = db.get_event_from_handle(event_handle) ed = event.get_description().upper() if len(self.list) > 2 and string.find(ed,self.list[2].upper())==-1: return 0 @@ -1184,7 +1184,7 @@ class HasDeath(Rule): event_handle = p.get_death_handle() if not event_handle: return 0 - event = db.find_event_from_handle(event_handle) + event = db.get_event_from_handle(event_handle) ed = event.get_description().upper() if self.list[2] and string.find(ed,self.list[2].upper())==-1: return 0 diff --git a/gramps2/src/Marriage.py b/gramps2/src/Marriage.py index 0098da617..91f416117 100644 --- a/gramps2/src/Marriage.py +++ b/gramps2/src/Marriage.py @@ -479,7 +479,7 @@ class Marriage: self.etree.clear() self.emap = {} for event_handle in self.elist: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if not event: continue place_handle = event.get_place_handle() diff --git a/gramps2/src/PedView.py b/gramps2/src/PedView.py index b386bf16d..f705787d2 100644 --- a/gramps2/src/PedView.py +++ b/gramps2/src/PedView.py @@ -74,12 +74,12 @@ class DispBox: birth_handle = self.person.get_birth_handle() death_handle = self.person.get_death_handle() if birth_handle: - bd = db.find_event_from_handle(birth_handle).get_date() + bd = db.get_event_from_handle(birth_handle).get_date() else: bd = "" if death_handle: - dd = db.find_event_from_handle(death_handle).get_date() + dd = db.get_event_from_handle(death_handle).get_date() else: dd = "" @@ -222,11 +222,11 @@ class PedigreeView: birth_handle = t[0].get_birth_handle() death_handle = t[0].get_death_handle() if birth_handle: - birth = self.parent.db.find_event_from_handle(birth_handle).get_date() + birth = self.parent.db.get_event_from_handle(birth_handle).get_date() else: birth = u"" if death_handle: - death = self.parent.db.find_event_from_handle(death_handle).get_date() + death = self.parent.db.get_event_from_handle(death_handle).get_date() else: death = u"" diff --git a/gramps2/src/PeopleModel.py b/gramps2/src/PeopleModel.py index 4403300a8..ebfca3806 100644 --- a/gramps2/src/PeopleModel.py +++ b/gramps2/src/PeopleModel.py @@ -295,19 +295,19 @@ class PeopleModel(gtk.GenericTreeModel): def column_birth_day(self,data): if data[_BIRTH_COL]: - return self.db.find_event_from_handle(data[_BIRTH_COL]).get_date() + return self.db.get_event_from_handle(data[_BIRTH_COL]).get_date() else: return u"" def column_death_day(self,data): if data[_DEATH_COL]: - return self.db.find_event_from_handle(data[_DEATH_COL]).get_date() + return self.db.get_event_from_handle(data[_DEATH_COL]).get_date() else: return u"" def column_birth_place(self,data): if data[_BIRTH_COL]: - event = self.db.find_event_from_handle(data[_BIRTH_COL]) + event = self.db.get_event_from_handle(data[_BIRTH_COL]) if event: place_handle = event.get_place_handle() if place_handle: @@ -316,7 +316,7 @@ class PeopleModel(gtk.GenericTreeModel): def column_death_place(self,data): if data[_DEATH_COL]: - event = self.db.find_event_from_handle(data[_DEATH_COL]) + event = self.db.get_event_from_handle(data[_DEATH_COL]) if event: place_handle = event.get_place_handle() if place_handle: diff --git a/gramps2/src/PlaceView.py b/gramps2/src/PlaceView.py index 8047baa6e..b91867246 100644 --- a/gramps2/src/PlaceView.py +++ b/gramps2/src/PlaceView.py @@ -187,7 +187,7 @@ class PlaceView: p = self.parent.db.get_person_from_handle(key) event_list = [] for e in [p.get_birth_handle(),p.get_death_handle()] + p.get_event_list(): - event = self.parent.db.find_event_from_handle(e) + event = self.parent.db.get_event_from_handle(e) if event: event_list.append(event) if p.get_lds_baptism(): @@ -204,7 +204,7 @@ class PlaceView: f = self.parent.db.get_family_from_handle(fid) event_list = [] for e in f.get_event_list(): - event = self.parent.db.find_event_from_handle(e) + event = self.parent.db.get_event_from_handle(e) if event: event_list.append(event) if f.get_lds_sealing(): diff --git a/gramps2/src/RelLib.py b/gramps2/src/RelLib.py index 8a972a737..8d362a372 100644 --- a/gramps2/src/RelLib.py +++ b/gramps2/src/RelLib.py @@ -531,7 +531,7 @@ class Person(PrimaryObject,SourceNote): if self.death_handle: return 0 if self.birth_handle: - birth = db.find_event_from_handle(self.birth_handle) + birth = db.get_event_from_handle(self.birth_handle) if birth.get_date() != "": return not_too_old(birth.get_date_object().get_start_date()) @@ -547,7 +547,7 @@ class Person(PrimaryObject,SourceNote): for child_handle in family.get_child_handle_list(): child = db.get_person_from_handle(child_handle) if child.birth_handle: - child_birth = db.find_event_from_handle(child.birth_handle) + child_birth = db.get_event_from_handle(child.birth_handle) if child_birth.get_date() != "": d = SingleDate (child_birth.get_date_object(). get_start_date()) @@ -556,7 +556,7 @@ class Person(PrimaryObject,SourceNote): return 1 if child.death_handle: - child_death = db.find_event_from_handle(child.death_handle) + child_death = db.get_event_from_handle(child.death_handle) if child_death.get_date() != "": d = SingleDate (child_death.get_date_object(). get_start_date()) @@ -580,7 +580,7 @@ class Person(PrimaryObject,SourceNote): parent = db.get_person_from_handle(parent_id) if parent.birth_handle: - parent_birth = db.find_event_from_handle(parent.birth_handle) + parent_birth = db.get_event_from_handle(parent.birth_handle) if parent_birth.get_date(): d = SingleDate (parent_birth.get_date_object(). get_start_date()) @@ -590,7 +590,7 @@ class Person(PrimaryObject,SourceNote): return 1 if parent.death_handle: - parent_death = db.find_event_from_handle(parent.death_handle) + parent_death = db.get_event_from_handle(parent.death_handle) if parent_death.get_date() != "": d = SingleDate (parent_death.get_date_object(). get_start_date()) @@ -612,7 +612,7 @@ class Person(PrimaryObject,SourceNote): continue spouse = db.get_person_from_handle(spouse_id) if spouse.birth_handle: - spouse_birth = db.find_event_from_handle(spouse.birth_handle) + spouse_birth = db.get_event_from_handle(spouse.birth_handle) if spouse_birth.get_date() != "": d = SingleDate (spouse_birth.get_date_object(). get_start_date()) @@ -621,7 +621,7 @@ class Person(PrimaryObject,SourceNote): return 0 if spouse.death_handle: - spouse_death = db.find_event_from_handle(spouse.death_handle) + spouse_death = db.get_event_from_handle(spouse.death_handle) if spouse_death.get_date() != "": d = SingleDate (spouse_birth.get_date_object(). get_start_date()) diff --git a/gramps2/src/SelectChild.py b/gramps2/src/SelectChild.py index 31de147fa..3e508d7ce 100644 --- a/gramps2/src/SelectChild.py +++ b/gramps2/src/SelectChild.py @@ -172,8 +172,8 @@ class SelectChild: def redraw_child_list(self,filter): return - birth = self.db.find_event_from_handle(self.person.get_birth_handle()) - death = self.db.find_event_from_handle(self.person.get_death_handle()) + birth = self.db.get_event_from_handle(self.person.get_birth_handle()) + death = self.db.get_event_from_handle(self.person.get_death_handle()) if birth: bday = birth.get_date_object() else: @@ -201,13 +201,13 @@ class SelectChild: if slist.has_key(key) or person.get_main_parents_family_handle(): continue - birth_event = self.db.find_event_from_handle(person.get_birth_handle()) + birth_event = self.db.get_event_from_handle(person.get_birth_handle()) if birth_event: pbday = birth_event.get_date_object() else: pbday = None - death_event = self.db.find_event_from_handle(person.get_death_handle()) + death_event = self.db.get_event_from_handle(person.get_death_handle()) if death_event: pdday = death_event.get_date_object() else: diff --git a/gramps2/src/Sort.py b/gramps2/src/Sort.py index 52d801426..dc2a89e56 100644 --- a/gramps2/src/Sort.py +++ b/gramps2/src/Sort.py @@ -106,13 +106,13 @@ class Sort: birth_handle1 = first.get_birth_handle() if birth_handle1: - date1 = self.database.find_event_from_handle(birth_handle1).get_date_object() + date1 = self.database.get_event_from_handle(birth_handle1).get_date_object() else: date1 = Date.Date() birth_handle2 = second.get_birth_handle() if birth_handle2: - date2 = self.database.find_event_from_handle(birth_handle2).get_date_object() + date2 = self.database.get_event_from_handle(birth_handle2).get_date_object() else: date2 = Date.Date() @@ -125,6 +125,6 @@ class Sort: """Sort routine for comparing two events by their dates. """ if not (a_id and b_id): return 0 - a = self.database.find_event_from_handle(a_id) - b = self.database.find_event_from_handle(b_id) + a = self.database.get_event_from_handle(a_id) + b = self.database.get_event_from_handle(b_id) return Date.compare_dates(a.get_date_object(),b.get_date_object()) diff --git a/gramps2/src/SourceView.py b/gramps2/src/SourceView.py index 58021be1b..bdeb18740 100644 --- a/gramps2/src/SourceView.py +++ b/gramps2/src/SourceView.py @@ -200,7 +200,7 @@ class SourceView: for key in self.parent.db.get_person_handles(sort_handles=False): p = self.parent.db.get_person_from_handle(key) for v_id in p.get_event_list() + [p.get_birth_handle(), p.get_death_handle()]: - v = self.parent.db.find_event_from_handle(v_id) + v = self.parent.db.get_event_from_handle(v_id) if v: for sref in v.get_source_references(): if sref.get_base_handle() == source.get_handle(): @@ -225,7 +225,7 @@ class SourceView: for p_id in self.parent.db.get_family_handles(): p = self.parent.db.get_family_from_handle(p_id) for v_id in p.get_event_list(): - v = self.parent.db.find_event_from_handle(v_id) + v = self.parent.db.get_event_from_handle(v_id) if v: for sref in v.get_source_references(): if sref.get_base_handle() == source.get_handle(): diff --git a/gramps2/src/SubstKeywords.py b/gramps2/src/SubstKeywords.py index 5742853e5..218db73ee 100644 --- a/gramps2/src/SubstKeywords.py +++ b/gramps2/src/SubstKeywords.py @@ -82,14 +82,14 @@ class SubstKeywords: birth_handle = person.get_birth_handle() if birth_handle: - birth = database.find_event_from_handle(birth_handle) + birth = database.get_event_from_handle(birth_handle) self.b = birth.get_date() bplace_handle = birth.get_place_handle() if bplace_handle: self.B = database.get_place_from_handle(bplace_handle).get_title() death_handle = person.get_death_handle() if death_handle: - death = database.find_event_from_handle(death_handle) + death = database.get_event_from_handle(death_handle) self.d = death.get_date() dplace_handle = death.get_place_handle() if dplace_handle: @@ -114,7 +114,7 @@ class SubstKeywords: for e_id in f.get_event_list(): if not e_id: continue - e = database.find_event_from_handle(e_id) + e = database.get_event_from_handle(e_id) if e.get_name() == 'Marriage': self.m = e.get_date() mplace_handle = e.get_place_handle() diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py index 0c0dfa643..9e8282122 100644 --- a/gramps2/src/WriteGedcom.py +++ b/gramps2/src/WriteGedcom.py @@ -114,7 +114,7 @@ def add_familys_sources(db,family_handle,slist,private): family = db.get_family_from_handle(family_handle) for event_handle in family.get_event_list(): if event_handle: - event = db.find_event_from_handle(event_handle) + event = db.get_event_from_handle(event_handle) if private and event.get_privacy(): continue for source_ref in event.get_source_references(): @@ -142,7 +142,7 @@ def add_persons_sources(db,person,slist,private): elist.append(person.get_death_handle()) for event_handle in elist: if event_handle: - event = db.find_event_from_handle(event_handle) + event = db.get_event_from_handle(event_handle) if private and event.get_privacy(): continue for source_ref in event.get_source_references(): @@ -764,7 +764,7 @@ class GedcomWriter: self.write_ord("SLGS",family.get_lds_sealing(),1,const.lds_ssealing) for event_handle in family.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if self.private and event.get_privacy(): continue name = event.get_name() @@ -871,14 +871,14 @@ class GedcomWriter: if not restricted: birth_handle = person.get_birth_handle() - birth = self.db.find_event_from_handle(birth_handle) + birth = self.db.get_event_from_handle(birth_handle) if birth_handle and not (self.private and birth.get_privacy()): if not birth.get_date_object().is_empty() or birth.get_place_handle(): self.writeln("1 BIRT") self.dump_event_stats(birth) death_handle = person.get_death_handle() - death = self.db.find_event_from_handle(death_handle) + death = self.db.get_event_from_handle(death_handle) if death_handle and not (self.private and death.get_privacy()): if not death.get_date_object().is_empty() or death.get_place_handle(): self.writeln("1 DEAT") @@ -891,7 +891,7 @@ class GedcomWriter: self.write_ord("SLGC",person.get_lds_sealing(),1,const.lds_csealing) for event_handle in person.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if self.private and event.get_privacy(): continue name = event.get_name() diff --git a/gramps2/src/WriteXML.py b/gramps2/src/WriteXML.py index b79c9c1e1..a40fa150a 100644 --- a/gramps2/src/WriteXML.py +++ b/gramps2/src/WriteXML.py @@ -261,12 +261,12 @@ class XmlWriter: self.dump_name("aka",name,3) self.write_line("nick",person.get_nick_name(),3) - birth = self.db.find_event_from_handle(person.get_birth_handle()) - death = self.db.find_event_from_handle(person.get_death_handle()) + birth = self.db.get_event_from_handle(person.get_birth_handle()) + death = self.db.get_event_from_handle(person.get_death_handle()) self.dump_my_event("Birth",birth,3) self.dump_my_event("Death",death,3) for event_handle in person.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) self.dump_event(event,3) self.dump_ordinance("baptism",person.get_lds_baptism(),3) @@ -332,7 +332,7 @@ class XmlWriter: self.write_ref("father",fid,3) self.write_ref("mother",mid,3) for event_handle in family.get_event_list(): - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) self.dump_event(event,3) self.dump_ordinance("sealed_to_spouse",family.get_lds_sealing(),3) diff --git a/gramps2/src/plugins/AncestorReport.py b/gramps2/src/plugins/AncestorReport.py index 59e8bbd65..321ca43ef 100644 --- a/gramps2/src/plugins/AncestorReport.py +++ b/gramps2/src/plugins/AncestorReport.py @@ -120,7 +120,7 @@ class AncestorReport(Report.Report): birth_handle = person.get_birth_handle() if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) date = birth.get_date_object().get_start_date() place_handle = birth.get_place_handle() if place_handle: @@ -149,13 +149,13 @@ class AncestorReport(Report.Report): buried = None for event_handle in person.get_event_list(): - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if string.lower(event.get_name()) == "burial": buried = event death_handle = person.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) date = death.get_date_object().get_start_date() place_handle = death.get_place_handle() if place_handle: diff --git a/gramps2/src/plugins/Ancestors.py b/gramps2/src/plugins/Ancestors.py index ff06b0497..37590438c 100644 --- a/gramps2/src/plugins/Ancestors.py +++ b/gramps2/src/plugins/Ancestors.py @@ -413,7 +413,7 @@ class ComprehensiveAncestorsReport (Report.Report): for event_handle in person.get_event_list (): if not event_handle: continue - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if event.get_name () == 'Occupation': if occupation: return '' @@ -490,7 +490,7 @@ class ComprehensiveAncestorsReport (Report.Report): birth_handle = person.get_birth_handle () if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) date = birth.get_date () if date: ret += _(" b. %(date)s") % {'date': date} @@ -498,7 +498,7 @@ class ComprehensiveAncestorsReport (Report.Report): death_handle = person.get_death_handle () if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) date = death.get_date () if date: ret += _(" d. %(date)s)") % {'date': date} @@ -510,14 +510,14 @@ class ComprehensiveAncestorsReport (Report.Report): ret = '' birth_handle = person.get_birth_handle () if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) born_info = self.event_info (birth) if born_info: ret = ", " + _("born") + born_info death_handle = person.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) died_info = self.event_info (death) if died_info: if born_info: @@ -716,7 +716,7 @@ class ComprehensiveAncestorsReport (Report.Report): for event_handle in family.get_event_list(): if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if event.get_name() == "Marriage": marriage = event break @@ -807,7 +807,7 @@ class ComprehensiveAncestorsReport (Report.Report): for event_handle in [person.get_birth_handle (), person.get_death_handle ()]: if not event_handle: continue - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) note = event.get_note () note_format = event.get_note_format () if note and (note_format != 0): @@ -817,7 +817,7 @@ class ComprehensiveAncestorsReport (Report.Report): for event_handle in event_handles: if not event_handle: continue - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) paras.append ((self.doc.start_paragraph, ['AR-Details'])) paras.append ((self.doc.write_text, [self.event_info (event)])) paras.append ((self.doc.end_paragraph, [])) diff --git a/gramps2/src/plugins/ChangeTypes.py b/gramps2/src/plugins/ChangeTypes.py index 1bbddd777..b31e56378 100644 --- a/gramps2/src/plugins/ChangeTypes.py +++ b/gramps2/src/plugins/ChangeTypes.py @@ -84,7 +84,7 @@ class ChangeTypes: for event_handle in person.get_event_list(): if not event_handle: continue - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_name() == original: event.set_name(new) modified = modified + 1 diff --git a/gramps2/src/plugins/DescendReport.py b/gramps2/src/plugins/DescendReport.py index c97782c71..ac29db77a 100644 --- a/gramps2/src/plugins/DescendReport.py +++ b/gramps2/src/plugins/DescendReport.py @@ -79,14 +79,14 @@ class DescendantReport: def dump_dates(self, person): birth_handle = person.get_birth_handle() if birth_handle: - birth = self.database.find_event_from_handle(birth_handle).get_date_object().get_start_date() + birth = self.database.get_event_from_handle(birth_handle).get_date_object().get_start_date() birth_year_valid = birth.get_year_valid() else: birth_year_valid = 0 death_handle = person.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle).get_date_object().get_start_date() + death = self.database.get_event_from_handle(death_handle).get_date_object().get_start_date() death_year_valid = death.get_year_valid() else: death_year_valid = 0 diff --git a/gramps2/src/plugins/DetAncestralReport.py b/gramps2/src/plugins/DetAncestralReport.py index 1172733b5..1ef1db25c 100644 --- a/gramps2/src/plugins/DetAncestralReport.py +++ b/gramps2/src/plugins/DetAncestralReport.py @@ -146,12 +146,12 @@ class DetAncestorReport(Report.Report): name= "[" + str(self.prevGenIDs.get(child_handle)) + "] "+ name if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) else: birth = None if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) else: death = None @@ -302,7 +302,7 @@ class DetAncestorReport(Report.Report): birth_handle = person.get_birth_handle() if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) date = birth.get_date_object().get_start_date() if birth.get_place_handle(): place = self.database.get_place_from_handle(birth.get_place_handle()).get_title() @@ -361,7 +361,7 @@ class DetAncestorReport(Report.Report): t= "" death_handle = person.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) date = death.get_date_object().get_start_date() if death.get_place_handle(): place = self.database.get_place_from_handle(death.get_place_handle()).get_title() @@ -523,7 +523,7 @@ class DetAncestorReport(Report.Report): for event_handle in fam.get_event_list(): if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if event.get_name() == "Marriage": marriage = event break @@ -1313,13 +1313,13 @@ class reportOptions: birth_handle = ind.get_birth_handle() if birth_handle: - birth = self.database.find_event_from_handle(birth_handle).get_date_object().get_start_date() + birth = self.database.get_event_from_handle(birth_handle).get_date_object().get_start_date() birth_year_valid = birth.get_year_valid() else: birth_year_valid = None death_handle = ind.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle).get_date_object().get_start_date() + death = self.database.get_event_from_handle(death_handle).get_date_object().get_start_date() death_year_valid = death.get_year_valid() else: death_year_valid = None diff --git a/gramps2/src/plugins/DetDescendantReport.py b/gramps2/src/plugins/DetDescendantReport.py index 3b7ec30a7..dcab9300f 100644 --- a/gramps2/src/plugins/DetDescendantReport.py +++ b/gramps2/src/plugins/DetDescendantReport.py @@ -149,12 +149,12 @@ class DetDescendantReport(Report.Report): name= "[" + str(self.prevGenIDs.get(child_handle)) + "] "+ name if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) else: birth = None if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) else: death = None @@ -303,7 +303,7 @@ class DetDescendantReport(Report.Report): birth_handle = person.get_birth_handle() if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) date = birth.get_date_object().get_start_date() if birth.get_place_handle(): place = self.database.get_place_from_handle(birth.get_place_handle()).get_title() @@ -359,7 +359,7 @@ class DetDescendantReport(Report.Report): t= "" death_handle = person.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) date = death.get_date_object().get_start_date() place_handle = death.get_place_handle() if place_handle: @@ -522,7 +522,7 @@ class DetDescendantReport(Report.Report): for event_handle in fam.get_event_list(): if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if event.get_name() == "Marriage": marriage = event break @@ -1323,13 +1323,13 @@ class reportOptions: birth_handle = ind.get_birth_handle() if birth_handle: - birth = self.database.find_event_from_handle(birth_handle).get_date_object().get_start_date() + birth = self.database.get_event_from_handle(birth_handle).get_date_object().get_start_date() birth_year_valid = birth.get_year_valid() else: birth_year_valid = None death_handle = ind.get_death_handle() if death_handle: - death = self.database.find_event_from_handle(death_handle).get_date_object().get_start_date() + death = self.database.get_event_from_handle(death_handle).get_date_object().get_start_date() death_year_valid = death.get_year_valid() else: death_year_valid = None diff --git a/gramps2/src/plugins/EventCmp.py b/gramps2/src/plugins/EventCmp.py index a33f6dd9b..7f3728cc4 100644 --- a/gramps2/src/plugins/EventCmp.py +++ b/gramps2/src/plugins/EventCmp.py @@ -322,7 +322,7 @@ class DisplayChart: bdate = "" bplace = "" if birth_handle: - birth = self.db.find_event_from_handle(birth_handle) + birth = self.db.get_event_from_handle(birth_handle) bdate = birth.get_date() bplace_handle = birth.get_place_handle() if bplace_handle: @@ -331,7 +331,7 @@ class DisplayChart: ddate = "" dplace = "" if death_handle: - death = self.db.find_event_from_handle(death_handle) + death = self.db.get_event_from_handle(death_handle) ddate = death.get_date() dplace_handle = death.get_place_handle() if dplace_handle: @@ -341,7 +341,7 @@ class DisplayChart: for ievent_handle in elist: if not ievent_handle: continue - ievent = self.db.find_event_from_handle(ievent_handle) + ievent = self.db.get_event_from_handle(ievent_handle) event_name = ievent.get_name() if map.has_key(event_name): map[event_name].append(ievent_handle) @@ -364,7 +364,7 @@ class DisplayChart: date = "" place = "" if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) date = event.get_date() place_handle = event.get_place_handle() if place_handle: @@ -392,7 +392,7 @@ class DisplayChart: for event_handle in elist: if not event_handle: continue - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) name = event.get_name() if not name: break diff --git a/gramps2/src/plugins/FamilyGroup.py b/gramps2/src/plugins/FamilyGroup.py index 49e0c20b7..fac512652 100644 --- a/gramps2/src/plugins/FamilyGroup.py +++ b/gramps2/src/plugins/FamilyGroup.py @@ -156,7 +156,7 @@ class FamilyGroup: bdate = "" bplace = "" if birth_handle: - birth = self.db.find_event_from_handle(birth_handle) + birth = self.db.get_event_from_handle(birth_handle) bdate = birth.get_date() bplace_handle = birth.get_place_handle() if bplace_handle: @@ -166,7 +166,7 @@ class FamilyGroup: ddate = "" dplace = "" if death_handle: - death = self.db.find_event_from_handle(death_handle) + death = self.db.get_event_from_handle(death_handle) ddate = death.get_date() dplace_handle = death.get_place_handle() if dplace_handle: @@ -301,12 +301,12 @@ class FamilyGroup: families = len(person.get_family_handle_list()) birth_handle = person.get_birth_handle() if birth_handle: - birth = self.db.find_event_from_handle(birth_handle) + birth = self.db.get_event_from_handle(birth_handle) else: birth = None death_handle = person.get_death_handle() if death_handle: - death = self.db.find_event_from_handle(death_handle) + death = self.db.get_event_from_handle(death_handle) else: death = None self.dump_child_event('FGR-TextChild1',_('Birth'),birth) @@ -320,7 +320,7 @@ class FamilyGroup: family = self.db.get_family_from_handle(family_handle) for event_handle in family.get_event_list(): if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_name() == "Marriage": m = event break diff --git a/gramps2/src/plugins/FanChart.py b/gramps2/src/plugins/FanChart.py index c8148ad4a..dcb93fa1a 100644 --- a/gramps2/src/plugins/FanChart.py +++ b/gramps2/src/plugins/FanChart.py @@ -205,7 +205,7 @@ class FanChart: birth_handle = person.get_birth_handle() if birth_handle: - b = self.database.find_event_from_handle(birth_handle).get_date_object().get_year() + b = self.database.get_event_from_handle(birth_handle).get_date_object().get_year() if b == Calendar.UNDEF: b = "" else: @@ -213,7 +213,7 @@ class FanChart: death_handle = person.get_death_handle() if death_handle: - d = self.database.find_event_from_handle(death_handle).get_date_object().get_year() + d = self.database.get_event_from_handle(death_handle).get_date_object().get_year() if d == Calendar.UNDEF: d = "" else: diff --git a/gramps2/src/plugins/FtmStyleAncestors.py b/gramps2/src/plugins/FtmStyleAncestors.py index 0de9dbfe8..a8a0eb833 100644 --- a/gramps2/src/plugins/FtmStyleAncestors.py +++ b/gramps2/src/plugins/FtmStyleAncestors.py @@ -116,7 +116,7 @@ class FtmAncestorReport(Report.Report): birth_handle = person.get_birth_handle() if birth_handle: birth_valid = 1 - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) place_handle = birth.get_place_handle() if place_handle: bplace = self.database.get_place_from_handle(place_handle).get_title() @@ -131,7 +131,7 @@ class FtmAncestorReport(Report.Report): death_handle = person.get_death_handle() if death_handle: death_valid = 1 - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) place_handle = death.get_place_handle() if place_handle: dplace = self.database.get_place_from_handle(place_handle).get_title() @@ -533,7 +533,7 @@ class FtmAncestorReport(Report.Report): ncount += 1 for event_handle in person.get_event_list(): - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) date = event.get_date() place_handle = event.get_place_handle() if place_handle: @@ -589,7 +589,7 @@ class FtmAncestorReport(Report.Report): for event_handle in family.get_event_list(): if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if event.get_name() == "Marriage": break else: @@ -653,7 +653,7 @@ class FtmAncestorReport(Report.Report): death_handle = spouse.get_death_handle() if death_handle: death_valid = 1 - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) ddate = death.get_date() place_handle = death.get_place_handle() if place_handle: @@ -668,7 +668,7 @@ class FtmAncestorReport(Report.Report): birth_handle = spouse.get_birth_handle() if birth_handle: birth_valid = 1 - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) bdate = birth.get_date() place_handle = birth.get_place_handle() if place_handle: diff --git a/gramps2/src/plugins/FtmStyleDescendants.py b/gramps2/src/plugins/FtmStyleDescendants.py index c5b970000..273616786 100644 --- a/gramps2/src/plugins/FtmStyleDescendants.py +++ b/gramps2/src/plugins/FtmStyleDescendants.py @@ -148,7 +148,7 @@ class FtmDescendantReport(Report.Report): bplace = "" bdate = "" if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) bdate = birth.get_date() bplace_handle = birth.get_place_handle() if bplace_handle: @@ -158,7 +158,7 @@ class FtmDescendantReport(Report.Report): dplace = "" ddate = "" if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) ddate = death.get_date() dplace_handle = death.get_place_handle() if dplace_handle: @@ -563,7 +563,7 @@ class FtmDescendantReport(Report.Report): for event_handle in person.get_event_list(): if not event_handle: continue - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) date = event.get_date() place_handle = event.get_place_handle() if place_handle: @@ -619,7 +619,7 @@ class FtmDescendantReport(Report.Report): for event_handle in family.get_event_list(): if not event_handle: continue - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) date = event.get_date() place_handle = event.get_place_handle() if place_handle: @@ -714,7 +714,7 @@ class FtmDescendantReport(Report.Report): bplace = "" bdate = "" if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) bdate = birth.get_date() bplace_handle = birth.get_place_handle() if bplace_handle: @@ -724,7 +724,7 @@ class FtmDescendantReport(Report.Report): dplace = "" ddate = "" if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) ddate = death.get_date() dplace_handle = death.get_place_handle() if dplace_handle: @@ -1011,7 +1011,7 @@ class FtmDescendantReport(Report.Report): for event_handle in family.get_event_list(): if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) if event.get_name() == "Marriage": break else: @@ -1076,7 +1076,7 @@ class FtmDescendantReport(Report.Report): bplace = "" bdate = "" if birth_handle: - birth = self.database.find_event_from_handle(birth_handle) + birth = self.database.get_event_from_handle(birth_handle) bdate = birth.get_date() bplace_handle = birth.get_place_handle() if bplace_handle: @@ -1086,7 +1086,7 @@ class FtmDescendantReport(Report.Report): dplace = "" ddate = "" if death_handle: - death = self.database.find_event_from_handle(death_handle) + death = self.database.get_event_from_handle(death_handle) ddate = death.get_date() dplace_handle = death.get_place_handle() if dplace_handle: diff --git a/gramps2/src/plugins/GraphViz.py b/gramps2/src/plugins/GraphViz.py index 260ba09cc..a46b580e2 100644 --- a/gramps2/src/plugins/GraphViz.py +++ b/gramps2/src/plugins/GraphViz.py @@ -457,7 +457,7 @@ def dump_index(database,person_list,file,includedates,includeurl,colorize, if includedates: birth_handle = person.get_birth_handle() if birth_handle: - birth_event = database.find_event_from_handle(birth_handle) + birth_event = database.get_event_from_handle(birth_handle) if birth_event.get_date_object().get_year_valid(): if just_year: birth = '%i' % birth_event.get_date_object().get_year() @@ -467,7 +467,7 @@ def dump_index(database,person_list,file,includedates,includeurl,colorize, birth = '' death_handle = person.get_death_handle() if death_handle: - death_event = database.find_event_from_handle(death_handle) + death_event = database.get_event_from_handle(death_handle) if death_event.get_date_object().get_year_valid(): if just_year: death = '%i' % death_event.get_date_object().get_year() @@ -504,7 +504,7 @@ def dump_index(database,person_list,file,includedates,includeurl,colorize, for event_handle in fam.get_event_list(): if event_handle: - event = database.find_event_from_handle(event_handle) + event = database.get_event_from_handle(event_handle) if event.get_name() == "Marriage": m = event break diff --git a/gramps2/src/plugins/IndivComplete.py b/gramps2/src/plugins/IndivComplete.py index 21f7f9f6b..2f2b2a1e1 100644 --- a/gramps2/src/plugins/IndivComplete.py +++ b/gramps2/src/plugins/IndivComplete.py @@ -292,7 +292,7 @@ class IndivComplete(Report.Report): for event_handle in family.get_event_list(): if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) self.write_fact(event) child_handle_list = family.get_child_handle_list() @@ -355,7 +355,7 @@ class IndivComplete(Report.Report): event_handle_list = event_handle_list + self.person.get_event_list() for event_handle in event_handle_list: if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) self.write_fact(event) self.d.end_table() self.d.start_paragraph("IDS-Normal") diff --git a/gramps2/src/plugins/IndivSummary.py b/gramps2/src/plugins/IndivSummary.py index e0e3f8d9e..ed3a8dcc7 100644 --- a/gramps2/src/plugins/IndivSummary.py +++ b/gramps2/src/plugins/IndivSummary.py @@ -189,7 +189,7 @@ class IndivSummary(Report.Report): self.d.end_row() for event_handle in family.get_event_list(): - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) self.write_fact(event) child_list = family.get_child_handle_list() @@ -338,7 +338,7 @@ class IndivSummary(Report.Report): event_list = event_list + self.person.get_event_list() for event_handle in event_list: if event_handle: - event = self.database.find_event_from_handle(event_handle) + event = self.database.get_event_from_handle(event_handle) self.write_fact(event) self.d.end_table() diff --git a/gramps2/src/plugins/Merge.py b/gramps2/src/plugins/Merge.py index 0f67f4d44..1a9940576 100644 --- a/gramps2/src/plugins/Merge.py +++ b/gramps2/src/plugins/Merge.py @@ -485,25 +485,25 @@ class Merge: birth1_id = p1.get_birth_handle() if birth1_id: - birth1 = self.db.find_event_from_handle(birth1_id) + birth1 = self.db.get_event_from_handle(birth1_id) else: birth1 = RelLib.Event() death1_id = p1.get_death_handle() if death1_id: - death1 = self.db.find_event_from_handle(death1_id) + death1 = self.db.get_event_from_handle(death1_id) else: death1 = RelLib.Event() birth2_id = p2.get_birth_handle() if birth2_id: - birth2 = self.db.find_event_from_handle(birth2_id) + birth2 = self.db.get_event_from_handle(birth2_id) else: birth2 = RelLib.Event() death2_id = p2.get_death_handle() if death2_id: - death2 = self.db.find_event_from_handle(death2_id) + death2 = self.db.get_event_from_handle(death2_id) else: death2 = RelLib.Event() diff --git a/gramps2/src/plugins/RelCalc.py b/gramps2/src/plugins/RelCalc.py index 35cfd26c9..82f3ae3fa 100644 --- a/gramps2/src/plugins/RelCalc.py +++ b/gramps2/src/plugins/RelCalc.py @@ -98,7 +98,7 @@ class RelCalc: if p == self.person: continue val = self.db.get_person_from_handle(key).get_display_info() - event = self.db.find_event_from_handle(val[3]) + event = self.db.get_event_from_handle(val[3]) event_date = "" if event: event_date = event.get_date () diff --git a/gramps2/src/plugins/RelGraph.py b/gramps2/src/plugins/RelGraph.py index 4c41ff51a..7f22b4757 100644 --- a/gramps2/src/plugins/RelGraph.py +++ b/gramps2/src/plugins/RelGraph.py @@ -720,7 +720,7 @@ def _get_individual_data (self, individual_id): def _get_event_label (self, event_handle): """Returns a formatted string of event data suitable for a label""" if self.IncludeDates and event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) date_obj = event.get_date_object() if date_obj.get_year_valid(): if self.JustYear: @@ -797,7 +797,7 @@ def _get_family_handle_label (self, family_handle): fam = self.db.get_family_from_handle(family_handle) for event_handle in fam.get_event_list(): if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_name() == "Marriage": marriage_event_handle = event_handle break @@ -831,7 +831,7 @@ def _get_family_handle_record_label (self, record): individual_family = self.db.get_family_from_handle(individual_family_handle) for event_handle in individual_family.get_event_list(): if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_name() == "Marriage": marriage_event_handle = event_handle break diff --git a/gramps2/src/plugins/Summary.py b/gramps2/src/plugins/Summary.py index 876f968d3..2cda5f732 100644 --- a/gramps2/src/plugins/Summary.py +++ b/gramps2/src/plugins/Summary.py @@ -94,7 +94,7 @@ def build_report(database,person): disconnected = disconnected + 1 birth_handle = person.get_birth_handle() if birth_handle: - birth = database.find_event_from_handle(birth_handle) + birth = database.get_event_from_handle(birth_handle) if not birth.get_date(): missing_bday = missing_bday + 1 else: diff --git a/gramps2/src/plugins/TimeLine.py b/gramps2/src/plugins/TimeLine.py index 1d83518cc..76a3431f8 100644 --- a/gramps2/src/plugins/TimeLine.py +++ b/gramps2/src/plugins/TimeLine.py @@ -186,13 +186,13 @@ class TimeLine: p = self.db.get_person_from_handle(p_id) b_id = p.get_birth_handle() if b_id: - b = self.db.find_event_from_handle(b_id).get_date_object().get_year() + b = self.db.get_event_from_handle(b_id).get_date_object().get_year() else: b = Date.UNDEF d_id = p.get_death_handle() if d_id: - d = self.db.find_event_from_handle(d_id).get_date_object().get_year() + d = self.db.get_event_from_handle(d_id).get_date_object().get_year() else: d = Date.UNDEF @@ -284,13 +284,13 @@ class TimeLine: p = self.db.get_person_from_handle(p_id) b_id = p.get_birth_handle() if b_id: - b = self.db.find_event_from_handle(b_id).get_date_object().get_year() + b = self.db.get_event_from_handle(b_id).get_date_object().get_year() else: b = Date.UNDEF d_id = p.get_death_handle() if d_id: - d = self.db.find_event_from_handle(d_id).get_date_object().get_year() + d = self.db.get_event_from_handle(d_id).get_date_object().get_year() else: d = Date.UNDEF diff --git a/gramps2/src/plugins/Verify.py b/gramps2/src/plugins/Verify.py index 8525f0e42..b086dca3a 100644 --- a/gramps2/src/plugins/Verify.py +++ b/gramps2/src/plugins/Verify.py @@ -114,7 +114,7 @@ class Verify: """ year = 0 if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) dateObj = event.get_date_object() if dateObj: if dateObj.get_calendar().NAME != Gregorian.NAME: @@ -158,7 +158,7 @@ class Verify: for event_handle in person.get_event_list(): if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) event_name = event.get_name().lower() if event.get_name() == "burial": buryear = get_year( event ) @@ -318,7 +318,7 @@ class Verify: for event_handle in family.get_event_list(): if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_name() == "Marriage": marriage_id = event_handle break diff --git a/gramps2/src/plugins/WebPage.py b/gramps2/src/plugins/WebPage.py index 16d81bddb..5fbbd121d 100644 --- a/gramps2/src/plugins/WebPage.py +++ b/gramps2/src/plugins/WebPage.py @@ -516,7 +516,7 @@ class IndividualPage: for event_handle in event_handle_list: if not event_handle: continue - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_privacy(): continue name = _(event.get_name()) @@ -654,7 +654,7 @@ class IndividualPage: if not self.alive: for event_handle in family.get_event_list(): if event_handle: - event = self.db.find_event_from_handle(event_handle) + event = self.db.get_event_from_handle(event_handle) if event.get_privacy() == 0: self.write_fam_fact(event) @@ -804,7 +804,7 @@ class WebReport(Report.Report): f.write("%s /%s/, %s|" % (firstName,surName, suffix)) for e_id in [p.get_birth_handle(),p.get_death_handle()]: if e_id: - e = self.db.find_event_from_handle(e_id) + e = self.db.get_event_from_handle(e_id) else: continue if e: @@ -889,7 +889,7 @@ class WebReport(Report.Report): if self.birth_dates: birth_handle = self.db.get_person_from_handle(person_handle).get_birth_handle() if birth_handle: - birth_event = self.db.find_event_from_handle(birth_handle) + birth_event = self.db.get_event_from_handle(birth_handle) if self.year_only: birth_dobj = birth_event.get_date_object() if birth_dobj.get_year_valid(): @@ -940,7 +940,7 @@ class WebReport(Report.Report): if self.birth_dates: birth_handle = self.db.get_person_from_handle(person_handle).get_birth_handle() if birth_handle: - birth_event = self.db.find_event_from_handle(birth_handle) + birth_event = self.db.get_event_from_handle(birth_handle) if self.year_only: birth_dobj = birth_event.get_date_object() if birth_dobj.get_year_valid(): diff --git a/gramps2/src/plugins/WriteCD.py b/gramps2/src/plugins/WriteCD.py index c4c835080..7de3490c9 100644 --- a/gramps2/src/plugins/WriteCD.py +++ b/gramps2/src/plugins/WriteCD.py @@ -234,7 +234,7 @@ class PackageWriter: p.set_media_list(nl) self.db.commit_place(p,None) for key in self.db.get_event_handles(): - p = self.db.find_event_from_handle(key) + p = self.db.get_event_from_handle(key) nl = p.get_media_list() for o in nl: if o.get_reference_handle() == self.object_handle: diff --git a/gramps2/src/plugins/WritePkg.py b/gramps2/src/plugins/WritePkg.py index d4bb7c0b9..613159091 100644 --- a/gramps2/src/plugins/WritePkg.py +++ b/gramps2/src/plugins/WritePkg.py @@ -117,7 +117,7 @@ class PackageWriter: p.set_media_list(nl) self.db.commit_place(p,None) for key in self.db.get_event_handles(): - p = self.db.find_event_from_handle(key) + p = self.db.get_event_from_handle(key) nl = p.get_media_list() for o in nl: if o.get_reference_handle() == m_id: