Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/AddSpouse.py, src/ChooseParents.py, src/EditPerson.py,

Browse Source 
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
This commit is contained in:
Alex Roitman 2004-08-21 18:56:01 +00:00
parent 55a76f77e1
commit a75338f737
43 changed files with 178 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -7,6 +7,25 @@
* src/Sources.py (draw): Correctly sort, use gramps id when * src/Sources.py (draw): Correctly sort, use gramps id when
displaying sources; (redraw): Use gramps id in the list view. 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 <dallingham@users.sourceforge.net> 2004-08-20 Don Allingham <dallingham@users.sourceforge.net>
* src/gramps_main.py: update family display after EditPerson * src/gramps_main.py: update family display after EditPerson
* src/EditPerson.py: fix callback * src/EditPerson.py: fix callback

10
src/AddSpouse.py
View File

@ -93,15 +93,13 @@ class AddSpouse:
birth_handle = self.person.get_birth_handle() birth_handle = self.person.get_birth_handle()
death_handle = self.person.get_death_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: 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: else:
self.bday = Date.Date() self.bday = Date.Date()
if death_handle: 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: else:
self.dday = Date.Date() self.dday = Date.Date()
@ -296,12 +294,12 @@ class AddSpouse:
pb_id = person.get_birth_handle() pb_id = person.get_birth_handle()
if pd_id: 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: else:
pdday = Date.Date() pdday = Date.Date()
if pb_id: 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: else:
pbday = Date.Date() pbday = Date.Date()

8
src/ChooseParents.py
View File

@ -96,13 +96,13 @@ class ChooseParents:
self.father_filter = self.likely_father_filter self.father_filter = self.likely_father_filter
self.mother_filter = self.likely_mother_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: if birth_event:
self.bday = birth_event.get_date_object() self.bday = birth_event.get_date_object()
else: else:
self.bday = None 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: if death_event:
self.dday = death_event.get_date_object() self.dday = death_event.get_date_object()
else: else:
@ -264,13 +264,13 @@ class ChooseParents:
def likely_filter(self,person): def likely_filter(self,person):
if person.get_handle() == self.person.get_handle(): if person.get_handle() == self.person.get_handle():
return 0 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: if birth_event:
pbday = birth_event.get_date_object() pbday = birth_event.get_date_object()
else: else:
pbday = None 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: if death_event:
pdday = death_event.get_date_object() pdday = death_event.get_date_object()
else: else:

16
src/EditPerson.py
View File

@ -210,8 +210,8 @@ class EditPerson:
self.gallery_label = self.get_widget("gallery_label") self.gallery_label = self.get_widget("gallery_label")
self.lds_tab = self.get_widget("lds_tab") self.lds_tab = self.get_widget("lds_tab")
self.orig_birth = self.db.find_event_from_handle(person.get_birth_handle()) self.orig_birth = self.db.get_event_from_handle(person.get_birth_handle())
self.orig_death = self.db.find_event_from_handle(person.get_death_handle()) self.orig_death = self.db.get_event_from_handle(person.get_death_handle())
self.death = RelLib.Event(self.orig_death) self.death = RelLib.Event(self.orig_death)
self.birth = RelLib.Event(self.orig_birth) self.birth = RelLib.Event(self.orig_birth)
self.pname = RelLib.Name(person.get_primary_name()) self.pname = RelLib.Name(person.get_primary_name())
@ -893,7 +893,7 @@ class EditPerson:
self.etree.clear() self.etree.clear()
self.emap = {} self.emap = {}
for event_handle in self.elist: 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) pname = place_title(self.db,event)
node = self.etree.add([const.display_pevent(event.get_name()),event.get_description(), node = self.etree.add([const.display_pevent(event.get_name()),event.get_description(),
event.get_quote_date(),pname],event) event.get_quote_date(),pname],event)
@ -1255,7 +1255,7 @@ class EditPerson:
store,node = obj.get_selected() store,node = obj.get_selected()
if node: if node:
row = store.get_path(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_date_field.set_text(event.get_date())
self.event_place_field.set_text(place_title(self.db,event)) self.event_place_field.set_text(place_title(self.db,event))
self.event_name_field.set_text(const.display_pevent(event.get_name())) self.event_name_field.set_text(const.display_pevent(event.get_name()))
@ -1770,7 +1770,7 @@ class EditPerson:
child_handle = list[i] child_handle = list[i]
child = self.db.get_person_from_handle(child_handle) child = self.db.get_person_from_handle(child_handle)
if child.get_birth_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() bday = event.get_date_object()
child_date = Sort.build_sort_date(bday) child_date = Sort.build_sort_date(bday)
else: else:
@ -1792,7 +1792,7 @@ class EditPerson:
# Build the person's date string once # Build the person's date string once
event_handle = person.get_birth_handle() event_handle = person.get_birth_handle()
if event_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()) person_bday = Sort.build_sort_date(event.get_date_object())
else: else:
person_bday = "99999999" person_bday = "99999999"
@ -1805,7 +1805,7 @@ class EditPerson:
other = self.db.get_person_from_handle(list[i]) other = self.db.get_person_from_handle(list[i])
event_handle = other.get_birth_handle() event_handle = other.get_birth_handle()
if event_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()) other_bday = Sort.build_sort_date(event.get_date_object())
if (other_bday == "99999999"): if (other_bday == "99999999"):
continue; continue;
@ -1820,7 +1820,7 @@ class EditPerson:
other = self.db.get_person_from_handle(list[i]) other = self.db.get_person_from_handle(list[i])
event_handle = other.get_birth_handle() event_handle = other.get_birth_handle()
if event_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()) other_bday = Sort.build_sort_date(event.get_date_object())
if (other_bday == "99999999"): if (other_bday == "99999999"):
continue; continue;

8
src/EditPlace.py
View File

@ -480,13 +480,13 @@ class EditPlace:
for key in self.db.get_person_handles(sort_handles=False): for key in self.db.get_person_handles(sort_handles=False):
p = self.db.get_person_from_handle(key) p = self.db.get_person_from_handle(key)
for event_handle in [p.get_birth_handle(), p.get_death_handle()] + p.get_event_list(): 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: if event and event.get_place_handle() == self.place:
pevent.append((p,event)) pevent.append((p,event))
for family_handle in self.db.get_family_handles(): for family_handle in self.db.get_family_handles():
f = self.db.get_family_from_handle(family_handle) f = self.db.get_family_from_handle(family_handle)
for event_handle in f.get_event_list(): 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: if event and event.get_place_handle() == self.place:
fevent.append((f,event)) fevent.append((f,event))
@ -562,7 +562,7 @@ class DeletePlaceQuery:
for key in self.db.get_person_handles(sort_handles=False): for key in self.db.get_person_handles(sort_handles=False):
p = self.db.get_person_from_handle(key) p = self.db.get_person_from_handle(key)
for event_handle in [p.get_birth_handle(), p.get_death_handle()] + p.get_event_list(): 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(): if event and event.get_place_handle() == self.place.get_handle():
event.set_place_handle(None) event.set_place_handle(None)
self.db.commit_event(event,trans) self.db.commit_event(event,trans)
@ -570,7 +570,7 @@ class DeletePlaceQuery:
for fid in self.db.get_family_handles(): for fid in self.db.get_family_handles():
f = self.db.get_family_from_handle(fid) f = self.db.get_family_from_handle(fid)
for event_handle in f.get_event_list(): 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(): if event and event.get_place_handle() == self.place.get_handle():
event.set_place_handle(None) event.set_place_handle(None)
self.db.commit_event(event,trans) self.db.commit_event(event,trans)

6
src/EditSource.py
View File

@ -240,7 +240,7 @@ class EditSource:
else: else:
name = GrampsCfg.get_nameof()(m) name = GrampsCfg.get_nameof()(m)
for v_id in p.get_event_list(): 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: if not v:
continue continue
for sref in v.get_source_references(): for sref in v.get_source_references():
@ -375,7 +375,7 @@ class DelSrcQuery:
commit = 0 commit = 0
p = self.db.get_person_from_handle(key) p = self.db.get_person_from_handle(key)
for v_id in p.get_event_list() + [p.get_birth_handle(), p.get_death_handle()]: 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: if v:
commit += self.delete_source(v) commit += self.delete_source(v)
@ -394,7 +394,7 @@ class DelSrcQuery:
commit = 0 commit = 0
p = self.db.get_family_from_handle(p_id) p = self.db.get_family_from_handle(p_id)
for v_id in p.get_event_list(): 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: if v:
commit += self.delete_source(v) commit += self.delete_source(v)

2
src/EventEdit.py
View File

@ -294,7 +294,7 @@ class EventEditor:
text = strip(unicode(field.get_text())) text = strip(unicode(field.get_text()))
if text: if text:
if self.pmap.has_key(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: else:
return None return None
else: else:

10
src/FamilyView.py
View File

@ -867,8 +867,8 @@ class FamilyView:
self.clear() self.clear()
return return
bd = self.parent.db.find_event_from_handle(self.person.get_birth_handle()) bd = self.parent.db.get_event_from_handle(self.person.get_birth_handle())
dd = self.parent.db.find_event_from_handle(self.person.get_death_handle()) dd = self.parent.db.get_event_from_handle(self.person.get_death_handle())
if bd and dd: if bd and dd:
n = "%s [%s]\n\t%s %s\n\t%s %s " % (GrampsCfg.get_nameof()(self.person), 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): def find_marriage(self,family):
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
return event return event
return None return None
@ -1051,7 +1051,7 @@ class FamilyView:
val = child.get_display_info() val = child.get_display_info()
i += 1 i += 1
event = self.parent.db.find_event_from_handle(val[3]) event = self.parent.db.get_event_from_handle(val[3])
if event: if event:
dval = event.get_date() dval = event.get_date()
else: else:
@ -1416,7 +1416,7 @@ class FamilyView:
child_handle = list[i] child_handle = list[i]
child = self.parent.db.get_person_from_handle(child_handle) child = self.parent.db.get_person_from_handle(child_handle)
birth_handle = child.get_birth_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: if not birth:
continue continue
bday = birth.get_date_object() bday = birth.get_date_object()

8
src/GenericFilter.py
View File

@ -971,7 +971,7 @@ class HasEvent(Rule):
for event_handle in p.get_event_list(): for event_handle in p.get_event_list():
if not event_handle: if not event_handle:
continue continue
event = db.find_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
val = 1 val = 1
if self.list[0] and event.get_name() != self.list[0]: if self.list[0] and event.get_name() != self.list[0]:
val = 0 val = 0
@ -1027,7 +1027,7 @@ class HasFamilyEvent(Rule):
for event_handle in f.get_event_list(): for event_handle in f.get_event_list():
if not event_handle: if not event_handle:
continue continue
event = db.find_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
val = 1 val = 1
if self.list[0] and event.get_name() != self.list[0]: if self.list[0] and event.get_name() != self.list[0]:
val = 0 val = 0
@ -1137,7 +1137,7 @@ class HasBirth(Rule):
event_handle = p.get_birth_handle() event_handle = p.get_birth_handle()
if not event_handle: if not event_handle:
return 0 return 0
event = db.find_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
ed = event.get_description().upper() ed = event.get_description().upper()
if len(self.list) > 2 and string.find(ed,self.list[2].upper())==-1: if len(self.list) > 2 and string.find(ed,self.list[2].upper())==-1:
return 0 return 0
@ -1184,7 +1184,7 @@ class HasDeath(Rule):
event_handle = p.get_death_handle() event_handle = p.get_death_handle()
if not event_handle: if not event_handle:
return 0 return 0
event = db.find_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
ed = event.get_description().upper() ed = event.get_description().upper()
if self.list[2] and string.find(ed,self.list[2].upper())==-1: if self.list[2] and string.find(ed,self.list[2].upper())==-1:
return 0 return 0

2
src/Marriage.py
View File

@ -479,7 +479,7 @@ class Marriage:
self.etree.clear() self.etree.clear()
self.emap = {} self.emap = {}
for event_handle in self.elist: 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: if not event:
continue continue
place_handle = event.get_place_handle() place_handle = event.get_place_handle()

8
src/PedView.py
View File

@ -74,12 +74,12 @@ class DispBox:
birth_handle = self.person.get_birth_handle() birth_handle = self.person.get_birth_handle()
death_handle = self.person.get_death_handle() death_handle = self.person.get_death_handle()
if birth_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: else:
bd = "" bd = ""
if death_handle: if death_handle:
dd = db.find_event_from_handle(death_handle).get_date() dd = db.get_event_from_handle(death_handle).get_date()
else: else:
dd = "" dd = ""
@ -222,11 +222,11 @@ class PedigreeView:
birth_handle = t[0].get_birth_handle() birth_handle = t[0].get_birth_handle()
death_handle = t[0].get_death_handle() death_handle = t[0].get_death_handle()
if birth_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: else:
birth = u"" birth = u""
if death_handle: 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: else:
death = u"" death = u""

8
src/PeopleModel.py
View File

@ -295,19 +295,19 @@ class PeopleModel(gtk.GenericTreeModel):
def column_birth_day(self,data): def column_birth_day(self,data):
if data[_BIRTH_COL]: 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: else:
return u"" return u""
def column_death_day(self,data): def column_death_day(self,data):
if data[_DEATH_COL]: 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: else:
return u"" return u""
def column_birth_place(self,data): def column_birth_place(self,data):
if data[_BIRTH_COL]: 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: if event:
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
@ -316,7 +316,7 @@ class PeopleModel(gtk.GenericTreeModel):
def column_death_place(self,data): def column_death_place(self,data):
if data[_DEATH_COL]: 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: if event:
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:

4
src/PlaceView.py
View File

@ -187,7 +187,7 @@ class PlaceView:
p = self.parent.db.get_person_from_handle(key) p = self.parent.db.get_person_from_handle(key)
event_list = [] event_list = []
for e in [p.get_birth_handle(),p.get_death_handle()] + p.get_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: if event:
event_list.append(event) event_list.append(event)
if p.get_lds_baptism(): if p.get_lds_baptism():
@ -204,7 +204,7 @@ class PlaceView:
f = self.parent.db.get_family_from_handle(fid) f = self.parent.db.get_family_from_handle(fid)
event_list = [] event_list = []
for e in f.get_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: if event:
event_list.append(event) event_list.append(event)
if f.get_lds_sealing(): if f.get_lds_sealing():

14
src/RelLib.py
View File

@ -531,7 +531,7 @@ class Person(PrimaryObject,SourceNote):
if self.death_handle: if self.death_handle:
return 0 return 0
if self.birth_handle: 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() != "": if birth.get_date() != "":
return not_too_old(birth.get_date_object().get_start_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(): for child_handle in family.get_child_handle_list():
child = db.get_person_from_handle(child_handle) child = db.get_person_from_handle(child_handle)
if child.birth_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() != "": if child_birth.get_date() != "":
d = SingleDate (child_birth.get_date_object(). d = SingleDate (child_birth.get_date_object().
get_start_date()) get_start_date())
@ -556,7 +556,7 @@ class Person(PrimaryObject,SourceNote):
return 1 return 1
if child.death_handle: 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() != "": if child_death.get_date() != "":
d = SingleDate (child_death.get_date_object(). d = SingleDate (child_death.get_date_object().
get_start_date()) get_start_date())
@ -580,7 +580,7 @@ class Person(PrimaryObject,SourceNote):
parent = db.get_person_from_handle(parent_id) parent = db.get_person_from_handle(parent_id)
if parent.birth_handle: 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(): if parent_birth.get_date():
d = SingleDate (parent_birth.get_date_object(). d = SingleDate (parent_birth.get_date_object().
get_start_date()) get_start_date())
@ -590,7 +590,7 @@ class Person(PrimaryObject,SourceNote):
return 1 return 1
if parent.death_handle: 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() != "": if parent_death.get_date() != "":
d = SingleDate (parent_death.get_date_object(). d = SingleDate (parent_death.get_date_object().
get_start_date()) get_start_date())
@ -612,7 +612,7 @@ class Person(PrimaryObject,SourceNote):
continue continue
spouse = db.get_person_from_handle(spouse_id) spouse = db.get_person_from_handle(spouse_id)
if spouse.birth_handle: 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() != "": if spouse_birth.get_date() != "":
d = SingleDate (spouse_birth.get_date_object(). d = SingleDate (spouse_birth.get_date_object().
get_start_date()) get_start_date())
@ -621,7 +621,7 @@ class Person(PrimaryObject,SourceNote):
return 0 return 0
if spouse.death_handle: 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() != "": if spouse_death.get_date() != "":
d = SingleDate (spouse_birth.get_date_object(). d = SingleDate (spouse_birth.get_date_object().
get_start_date()) get_start_date())

8
src/SelectChild.py
View File

@ -172,8 +172,8 @@ class SelectChild:
def redraw_child_list(self,filter): def redraw_child_list(self,filter):
return return
birth = self.db.find_event_from_handle(self.person.get_birth_handle()) birth = self.db.get_event_from_handle(self.person.get_birth_handle())
death = self.db.find_event_from_handle(self.person.get_death_handle()) death = self.db.get_event_from_handle(self.person.get_death_handle())
if birth: if birth:
bday = birth.get_date_object() bday = birth.get_date_object()
else: else:
@ -201,13 +201,13 @@ class SelectChild:
if slist.has_key(key) or person.get_main_parents_family_handle(): if slist.has_key(key) or person.get_main_parents_family_handle():
continue 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: if birth_event:
pbday = birth_event.get_date_object() pbday = birth_event.get_date_object()
else: else:
pbday = None 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: if death_event:
pdday = death_event.get_date_object() pdday = death_event.get_date_object()
else: else:

8
src/Sort.py
View File

@ -106,13 +106,13 @@ class Sort:
birth_handle1 = first.get_birth_handle() birth_handle1 = first.get_birth_handle()
if birth_handle1: 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: else:
date1 = Date.Date() date1 = Date.Date()
birth_handle2 = second.get_birth_handle() birth_handle2 = second.get_birth_handle()
if birth_handle2: 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: else:
date2 = Date.Date() date2 = Date.Date()
@ -125,6 +125,6 @@ class Sort:
"""Sort routine for comparing two events by their dates. """ """Sort routine for comparing two events by their dates. """
if not (a_id and b_id): if not (a_id and b_id):
return 0 return 0
a = self.database.find_event_from_handle(a_id) a = self.database.get_event_from_handle(a_id)
b = self.database.find_event_from_handle(b_id) b = self.database.get_event_from_handle(b_id)
return Date.compare_dates(a.get_date_object(),b.get_date_object()) return Date.compare_dates(a.get_date_object(),b.get_date_object())

4
src/SourceView.py
View File

@ -200,7 +200,7 @@ class SourceView:
for key in self.parent.db.get_person_handles(sort_handles=False): for key in self.parent.db.get_person_handles(sort_handles=False):
p = self.parent.db.get_person_from_handle(key) 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()]: 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: if v:
for sref in v.get_source_references(): for sref in v.get_source_references():
if sref.get_base_handle() == source.get_handle(): if sref.get_base_handle() == source.get_handle():
@ -225,7 +225,7 @@ class SourceView:
for p_id in self.parent.db.get_family_handles(): for p_id in self.parent.db.get_family_handles():
p = self.parent.db.get_family_from_handle(p_id) p = self.parent.db.get_family_from_handle(p_id)
for v_id in p.get_event_list(): 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: if v:
for sref in v.get_source_references(): for sref in v.get_source_references():
if sref.get_base_handle() == source.get_handle(): if sref.get_base_handle() == source.get_handle():

6
src/SubstKeywords.py
View File

@ -82,14 +82,14 @@ class SubstKeywords:
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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() self.b = birth.get_date()
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
self.B = database.get_place_from_handle(bplace_handle).get_title() self.B = database.get_place_from_handle(bplace_handle).get_title()
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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() self.d = death.get_date()
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:
@ -114,7 +114,7 @@ class SubstKeywords:
for e_id in f.get_event_list(): for e_id in f.get_event_list():
if not e_id: if not e_id:
continue continue
e = database.find_event_from_handle(e_id) e = database.get_event_from_handle(e_id)
if e.get_name() == 'Marriage': if e.get_name() == 'Marriage':
self.m = e.get_date() self.m = e.get_date()
mplace_handle = e.get_place_handle() mplace_handle = e.get_place_handle()

12
src/WriteGedcom.py
View File

@ -114,7 +114,7 @@ def add_familys_sources(db,family_handle,slist,private):
family = db.get_family_from_handle(family_handle) family = db.get_family_from_handle(family_handle)
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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(): if private and event.get_privacy():
continue continue
for source_ref in event.get_source_references(): 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()) elist.append(person.get_death_handle())
for event_handle in elist: for event_handle in elist:
if event_handle: 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(): if private and event.get_privacy():
continue continue
for source_ref in event.get_source_references(): 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) self.write_ord("SLGS",family.get_lds_sealing(),1,const.lds_ssealing)
for event_handle in family.get_event_list(): 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(): if self.private and event.get_privacy():
continue continue
name = event.get_name() name = event.get_name()
@ -871,14 +871,14 @@ class GedcomWriter:
if not restricted: if not restricted:
birth_handle = person.get_birth_handle() 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 birth_handle and not (self.private and birth.get_privacy()):
if not birth.get_date_object().is_empty() or birth.get_place_handle(): if not birth.get_date_object().is_empty() or birth.get_place_handle():
self.writeln("1 BIRT") self.writeln("1 BIRT")
self.dump_event_stats(birth) self.dump_event_stats(birth)
death_handle = person.get_death_handle() 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 death_handle and not (self.private and death.get_privacy()):
if not death.get_date_object().is_empty() or death.get_place_handle(): if not death.get_date_object().is_empty() or death.get_place_handle():
self.writeln("1 DEAT") self.writeln("1 DEAT")
@ -891,7 +891,7 @@ class GedcomWriter:
self.write_ord("SLGC",person.get_lds_sealing(),1,const.lds_csealing) self.write_ord("SLGC",person.get_lds_sealing(),1,const.lds_csealing)
for event_handle in person.get_event_list(): 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(): if self.private and event.get_privacy():
continue continue
name = event.get_name() name = event.get_name()

8
src/WriteXML.py
View File

@ -261,12 +261,12 @@ class XmlWriter:
self.dump_name("aka",name,3) self.dump_name("aka",name,3)
self.write_line("nick",person.get_nick_name(),3) self.write_line("nick",person.get_nick_name(),3)
birth = self.db.find_event_from_handle(person.get_birth_handle()) birth = self.db.get_event_from_handle(person.get_birth_handle())
death = self.db.find_event_from_handle(person.get_death_handle()) death = self.db.get_event_from_handle(person.get_death_handle())
self.dump_my_event("Birth",birth,3) self.dump_my_event("Birth",birth,3)
self.dump_my_event("Death",death,3) self.dump_my_event("Death",death,3)
for event_handle in person.get_event_list(): 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_event(event,3)
self.dump_ordinance("baptism",person.get_lds_baptism(),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("father",fid,3)
self.write_ref("mother",mid,3) self.write_ref("mother",mid,3)
for event_handle in family.get_event_list(): 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_event(event,3)
self.dump_ordinance("sealed_to_spouse",family.get_lds_sealing(),3) self.dump_ordinance("sealed_to_spouse",family.get_lds_sealing(),3)

6
src/plugins/AncestorReport.py
View File

@ -120,7 +120,7 @@ class AncestorReport(Report.Report):
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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() date = birth.get_date_object().get_start_date()
place_handle = birth.get_place_handle() place_handle = birth.get_place_handle()
if place_handle: if place_handle:
@ -149,13 +149,13 @@ class AncestorReport(Report.Report):
buried = None buried = None
for event_handle in person.get_event_list(): 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": if string.lower(event.get_name()) == "burial":
buried = event buried = event
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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() date = death.get_date_object().get_start_date()
place_handle = death.get_place_handle() place_handle = death.get_place_handle()
if place_handle: if place_handle:

16
src/plugins/Ancestors.py
View File

@ -413,7 +413,7 @@ class ComprehensiveAncestorsReport (Report.Report):
for event_handle in person.get_event_list (): for event_handle in person.get_event_list ():
if not event_handle: if not event_handle:
continue 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 event.get_name () == 'Occupation':
if occupation: if occupation:
return '' return ''
@ -490,7 +490,7 @@ class ComprehensiveAncestorsReport (Report.Report):
birth_handle = person.get_birth_handle () birth_handle = person.get_birth_handle ()
if 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 () date = birth.get_date ()
if date: if date:
ret += _(" b. %(date)s") % {'date': date} ret += _(" b. %(date)s") % {'date': date}
@ -498,7 +498,7 @@ class ComprehensiveAncestorsReport (Report.Report):
death_handle = person.get_death_handle () death_handle = person.get_death_handle ()
if 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 () date = death.get_date ()
if date: if date:
ret += _(" d. %(date)s)") % {'date': date} ret += _(" d. %(date)s)") % {'date': date}
@ -510,14 +510,14 @@ class ComprehensiveAncestorsReport (Report.Report):
ret = '' ret = ''
birth_handle = person.get_birth_handle () birth_handle = person.get_birth_handle ()
if 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) born_info = self.event_info (birth)
if born_info: if born_info:
ret = ", " + _("born") + born_info ret = ", " + _("born") + born_info
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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) died_info = self.event_info (death)
if died_info: if died_info:
if born_info: if born_info:
@ -716,7 +716,7 @@ class ComprehensiveAncestorsReport (Report.Report):
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
marriage = event marriage = event
break break
@ -807,7 +807,7 @@ class ComprehensiveAncestorsReport (Report.Report):
for event_handle in [person.get_birth_handle (), person.get_death_handle ()]: for event_handle in [person.get_birth_handle (), person.get_death_handle ()]:
if not event_handle: if not event_handle:
continue continue
event = self.database.find_event_from_handle(event_handle) event = self.database.get_event_from_handle(event_handle)
note = event.get_note () note = event.get_note ()
note_format = event.get_note_format () note_format = event.get_note_format ()
if note and (note_format != 0): if note and (note_format != 0):
@ -817,7 +817,7 @@ class ComprehensiveAncestorsReport (Report.Report):
for event_handle in event_handles: for event_handle in event_handles:
if not event_handle: if not event_handle:
continue 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.start_paragraph, ['AR-Details']))
paras.append ((self.doc.write_text, [self.event_info (event)])) paras.append ((self.doc.write_text, [self.event_info (event)]))
paras.append ((self.doc.end_paragraph, [])) paras.append ((self.doc.end_paragraph, []))

2
src/plugins/ChangeTypes.py
View File

@ -84,7 +84,7 @@ class ChangeTypes:
for event_handle in person.get_event_list(): for event_handle in person.get_event_list():
if not event_handle: if not event_handle:
continue continue
event = self.db.find_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
if event.get_name() == original: if event.get_name() == original:
event.set_name(new) event.set_name(new)
modified = modified + 1 modified = modified + 1

4
src/plugins/DescendReport.py
View File

@ -79,14 +79,14 @@ class DescendantReport:
def dump_dates(self, person): def dump_dates(self, person):
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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() birth_year_valid = birth.get_year_valid()
else: else:
birth_year_valid = 0 birth_year_valid = 0
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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() death_year_valid = death.get_year_valid()
else: else:
death_year_valid = 0 death_year_valid = 0

14
src/plugins/DetAncestralReport.py
View File

@ -146,12 +146,12 @@ class DetAncestorReport(Report.Report):
name= "[" + str(self.prevGenIDs.get(child_handle)) + "] "+ name name= "[" + str(self.prevGenIDs.get(child_handle)) + "] "+ name
if birth_handle: if birth_handle:
birth = self.database.find_event_from_handle(birth_handle) birth = self.database.get_event_from_handle(birth_handle)
else: else:
birth = None birth = None
if death_handle: if death_handle:
death = self.database.find_event_from_handle(death_handle) death = self.database.get_event_from_handle(death_handle)
else: else:
death = None death = None
@ -302,7 +302,7 @@ class DetAncestorReport(Report.Report):
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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() date = birth.get_date_object().get_start_date()
if birth.get_place_handle(): if birth.get_place_handle():
place = self.database.get_place_from_handle(birth.get_place_handle()).get_title() place = self.database.get_place_from_handle(birth.get_place_handle()).get_title()
@ -361,7 +361,7 @@ class DetAncestorReport(Report.Report):
t= "" t= ""
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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() date = death.get_date_object().get_start_date()
if death.get_place_handle(): if death.get_place_handle():
place = self.database.get_place_from_handle(death.get_place_handle()).get_title() 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(): for event_handle in fam.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
marriage = event marriage = event
break break
@ -1313,13 +1313,13 @@ class reportOptions:
birth_handle = ind.get_birth_handle() birth_handle = ind.get_birth_handle()
if 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() birth_year_valid = birth.get_year_valid()
else: else:
birth_year_valid = None birth_year_valid = None
death_handle = ind.get_death_handle() death_handle = ind.get_death_handle()
if 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() death_year_valid = death.get_year_valid()
else: else:
death_year_valid = None death_year_valid = None

14
src/plugins/DetDescendantReport.py
View File

@ -149,12 +149,12 @@ class DetDescendantReport(Report.Report):
name= "[" + str(self.prevGenIDs.get(child_handle)) + "] "+ name name= "[" + str(self.prevGenIDs.get(child_handle)) + "] "+ name
if birth_handle: if birth_handle:
birth = self.database.find_event_from_handle(birth_handle) birth = self.database.get_event_from_handle(birth_handle)
else: else:
birth = None birth = None
if death_handle: if death_handle:
death = self.database.find_event_from_handle(death_handle) death = self.database.get_event_from_handle(death_handle)
else: else:
death = None death = None
@ -303,7 +303,7 @@ class DetDescendantReport(Report.Report):
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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() date = birth.get_date_object().get_start_date()
if birth.get_place_handle(): if birth.get_place_handle():
place = self.database.get_place_from_handle(birth.get_place_handle()).get_title() place = self.database.get_place_from_handle(birth.get_place_handle()).get_title()
@ -359,7 +359,7 @@ class DetDescendantReport(Report.Report):
t= "" t= ""
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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() date = death.get_date_object().get_start_date()
place_handle = death.get_place_handle() place_handle = death.get_place_handle()
if place_handle: if place_handle:
@ -522,7 +522,7 @@ class DetDescendantReport(Report.Report):
for event_handle in fam.get_event_list(): for event_handle in fam.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
marriage = event marriage = event
break break
@ -1323,13 +1323,13 @@ class reportOptions:
birth_handle = ind.get_birth_handle() birth_handle = ind.get_birth_handle()
if 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() birth_year_valid = birth.get_year_valid()
else: else:
birth_year_valid = None birth_year_valid = None
death_handle = ind.get_death_handle() death_handle = ind.get_death_handle()
if 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() death_year_valid = death.get_year_valid()
else: else:
death_year_valid = None death_year_valid = None

10
src/plugins/EventCmp.py
View File

@ -322,7 +322,7 @@ class DisplayChart:
bdate = "" bdate = ""
bplace = "" bplace = ""
if birth_handle: 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() bdate = birth.get_date()
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
@ -331,7 +331,7 @@ class DisplayChart:
ddate = "" ddate = ""
dplace = "" dplace = ""
if death_handle: 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() ddate = death.get_date()
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:
@ -341,7 +341,7 @@ class DisplayChart:
for ievent_handle in elist: for ievent_handle in elist:
if not ievent_handle: if not ievent_handle:
continue continue
ievent = self.db.find_event_from_handle(ievent_handle) ievent = self.db.get_event_from_handle(ievent_handle)
event_name = ievent.get_name() event_name = ievent.get_name()
if map.has_key(event_name): if map.has_key(event_name):
map[event_name].append(ievent_handle) map[event_name].append(ievent_handle)
@ -364,7 +364,7 @@ class DisplayChart:
date = "" date = ""
place = "" place = ""
if event_handle: 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() date = event.get_date()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
@ -392,7 +392,7 @@ class DisplayChart:
for event_handle in elist: for event_handle in elist:
if not event_handle: if not event_handle:
continue continue
event = self.db.find_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
name = event.get_name() name = event.get_name()
if not name: if not name:
break break

10
src/plugins/FamilyGroup.py
View File

@ -156,7 +156,7 @@ class FamilyGroup:
bdate = "" bdate = ""
bplace = "" bplace = ""
if birth_handle: 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() bdate = birth.get_date()
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
@ -166,7 +166,7 @@ class FamilyGroup:
ddate = "" ddate = ""
dplace = "" dplace = ""
if death_handle: 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() ddate = death.get_date()
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:
@ -301,12 +301,12 @@ class FamilyGroup:
families = len(person.get_family_handle_list()) families = len(person.get_family_handle_list())
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if birth_handle: if birth_handle:
birth = self.db.find_event_from_handle(birth_handle) birth = self.db.get_event_from_handle(birth_handle)
else: else:
birth = None birth = None
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if death_handle: if death_handle:
death = self.db.find_event_from_handle(death_handle) death = self.db.get_event_from_handle(death_handle)
else: else:
death = None death = None
self.dump_child_event('FGR-TextChild1',_('Birth'),birth) self.dump_child_event('FGR-TextChild1',_('Birth'),birth)
@ -320,7 +320,7 @@ class FamilyGroup:
family = self.db.get_family_from_handle(family_handle) family = self.db.get_family_from_handle(family_handle)
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
m = event m = event
break break

4
src/plugins/FanChart.py
View File

@ -205,7 +205,7 @@ class FanChart:
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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: if b == Calendar.UNDEF:
b = "" b = ""
else: else:
@ -213,7 +213,7 @@ class FanChart:
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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: if d == Calendar.UNDEF:
d = "" d = ""
else: else:

12
src/plugins/FtmStyleAncestors.py
View File

@ -116,7 +116,7 @@ class FtmAncestorReport(Report.Report):
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if birth_handle: if birth_handle:
birth_valid = 1 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() place_handle = birth.get_place_handle()
if place_handle: if place_handle:
bplace = self.database.get_place_from_handle(place_handle).get_title() 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() death_handle = person.get_death_handle()
if death_handle: if death_handle:
death_valid = 1 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() place_handle = death.get_place_handle()
if place_handle: if place_handle:
dplace = self.database.get_place_from_handle(place_handle).get_title() dplace = self.database.get_place_from_handle(place_handle).get_title()
@ -533,7 +533,7 @@ class FtmAncestorReport(Report.Report):
ncount += 1 ncount += 1
for event_handle in person.get_event_list(): 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() date = event.get_date()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
@ -589,7 +589,7 @@ class FtmAncestorReport(Report.Report):
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
break break
else: else:
@ -653,7 +653,7 @@ class FtmAncestorReport(Report.Report):
death_handle = spouse.get_death_handle() death_handle = spouse.get_death_handle()
if death_handle: if death_handle:
death_valid = 1 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() ddate = death.get_date()
place_handle = death.get_place_handle() place_handle = death.get_place_handle()
if place_handle: if place_handle:
@ -668,7 +668,7 @@ class FtmAncestorReport(Report.Report):
birth_handle = spouse.get_birth_handle() birth_handle = spouse.get_birth_handle()
if birth_handle: if birth_handle:
birth_valid = 1 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() bdate = birth.get_date()
place_handle = birth.get_place_handle() place_handle = birth.get_place_handle()
if place_handle: if place_handle:

18
src/plugins/FtmStyleDescendants.py
View File

@ -148,7 +148,7 @@ class FtmDescendantReport(Report.Report):
bplace = "" bplace = ""
bdate = "" bdate = ""
if birth_handle: 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() bdate = birth.get_date()
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
@ -158,7 +158,7 @@ class FtmDescendantReport(Report.Report):
dplace = "" dplace = ""
ddate = "" ddate = ""
if death_handle: 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() ddate = death.get_date()
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:
@ -563,7 +563,7 @@ class FtmDescendantReport(Report.Report):
for event_handle in person.get_event_list(): for event_handle in person.get_event_list():
if not event_handle: if not event_handle:
continue continue
event = self.database.find_event_from_handle(event_handle) event = self.database.get_event_from_handle(event_handle)
date = event.get_date() date = event.get_date()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
@ -619,7 +619,7 @@ class FtmDescendantReport(Report.Report):
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if not event_handle: if not event_handle:
continue continue
event = self.database.find_event_from_handle(event_handle) event = self.database.get_event_from_handle(event_handle)
date = event.get_date() date = event.get_date()
place_handle = event.get_place_handle() place_handle = event.get_place_handle()
if place_handle: if place_handle:
@ -714,7 +714,7 @@ class FtmDescendantReport(Report.Report):
bplace = "" bplace = ""
bdate = "" bdate = ""
if birth_handle: 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() bdate = birth.get_date()
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
@ -724,7 +724,7 @@ class FtmDescendantReport(Report.Report):
dplace = "" dplace = ""
ddate = "" ddate = ""
if death_handle: 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() ddate = death.get_date()
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:
@ -1011,7 +1011,7 @@ class FtmDescendantReport(Report.Report):
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
break break
else: else:
@ -1076,7 +1076,7 @@ class FtmDescendantReport(Report.Report):
bplace = "" bplace = ""
bdate = "" bdate = ""
if birth_handle: 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() bdate = birth.get_date()
bplace_handle = birth.get_place_handle() bplace_handle = birth.get_place_handle()
if bplace_handle: if bplace_handle:
@ -1086,7 +1086,7 @@ class FtmDescendantReport(Report.Report):
dplace = "" dplace = ""
ddate = "" ddate = ""
if death_handle: 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() ddate = death.get_date()
dplace_handle = death.get_place_handle() dplace_handle = death.get_place_handle()
if dplace_handle: if dplace_handle:

6
src/plugins/GraphViz.py
View File

@ -457,7 +457,7 @@ def dump_index(database,person_list,file,includedates,includeurl,colorize,
if includedates: if includedates:
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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 birth_event.get_date_object().get_year_valid():
if just_year: if just_year:
birth = '%i' % birth_event.get_date_object().get_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 = '' birth = ''
death_handle = person.get_death_handle() death_handle = person.get_death_handle()
if 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 death_event.get_date_object().get_year_valid():
if just_year: if just_year:
death = '%i' % death_event.get_date_object().get_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(): for event_handle in fam.get_event_list():
if event_handle: if event_handle:
event = database.find_event_from_handle(event_handle) event = database.get_event_from_handle(event_handle)
if event.get_name() == "Marriage": if event.get_name() == "Marriage":
m = event m = event
break break

4
src/plugins/IndivComplete.py
View File

@ -292,7 +292,7 @@ class IndivComplete(Report.Report):
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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.write_fact(event)
child_handle_list = family.get_child_handle_list() 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() event_handle_list = event_handle_list + self.person.get_event_list()
for event_handle in event_handle_list: for event_handle in event_handle_list:
if event_handle: 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.write_fact(event)
self.d.end_table() self.d.end_table()
self.d.start_paragraph("IDS-Normal") self.d.start_paragraph("IDS-Normal")

4
src/plugins/IndivSummary.py
View File

@ -189,7 +189,7 @@ class IndivSummary(Report.Report):
self.d.end_row() self.d.end_row()
for event_handle in family.get_event_list(): 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) self.write_fact(event)
child_list = family.get_child_handle_list() child_list = family.get_child_handle_list()
@ -338,7 +338,7 @@ class IndivSummary(Report.Report):
event_list = event_list + self.person.get_event_list() event_list = event_list + self.person.get_event_list()
for event_handle in event_list: for event_handle in event_list:
if event_handle: 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.write_fact(event)
self.d.end_table() self.d.end_table()

8
src/plugins/Merge.py
View File

@ -485,25 +485,25 @@ class Merge:
birth1_id = p1.get_birth_handle() birth1_id = p1.get_birth_handle()
if birth1_id: if birth1_id:
birth1 = self.db.find_event_from_handle(birth1_id) birth1 = self.db.get_event_from_handle(birth1_id)
else: else:
birth1 = RelLib.Event() birth1 = RelLib.Event()
death1_id = p1.get_death_handle() death1_id = p1.get_death_handle()
if death1_id: if death1_id:
death1 = self.db.find_event_from_handle(death1_id) death1 = self.db.get_event_from_handle(death1_id)
else: else:
death1 = RelLib.Event() death1 = RelLib.Event()
birth2_id = p2.get_birth_handle() birth2_id = p2.get_birth_handle()
if birth2_id: if birth2_id:
birth2 = self.db.find_event_from_handle(birth2_id) birth2 = self.db.get_event_from_handle(birth2_id)
else: else:
birth2 = RelLib.Event() birth2 = RelLib.Event()
death2_id = p2.get_death_handle() death2_id = p2.get_death_handle()
if death2_id: if death2_id:
death2 = self.db.find_event_from_handle(death2_id) death2 = self.db.get_event_from_handle(death2_id)
else: else:
death2 = RelLib.Event() death2 = RelLib.Event()

2
src/plugins/RelCalc.py
View File

@ -98,7 +98,7 @@ class RelCalc:
if p == self.person: if p == self.person:
continue continue
val = self.db.get_person_from_handle(key).get_display_info() 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 = "" event_date = ""
if event: if event:
event_date = event.get_date () event_date = event.get_date ()

6
src/plugins/RelGraph.py
View File

@ -720,7 +720,7 @@ def _get_individual_data (self, individual_id):
def _get_event_label (self, event_handle): def _get_event_label (self, event_handle):
"""Returns a formatted string of event data suitable for a label""" """Returns a formatted string of event data suitable for a label"""
if self.IncludeDates and event_handle: 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() date_obj = event.get_date_object()
if date_obj.get_year_valid(): if date_obj.get_year_valid():
if self.JustYear: if self.JustYear:
@ -797,7 +797,7 @@ def _get_family_handle_label (self, family_handle):
fam = self.db.get_family_from_handle(family_handle) fam = self.db.get_family_from_handle(family_handle)
for event_handle in fam.get_event_list(): for event_handle in fam.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
marriage_event_handle = event_handle marriage_event_handle = event_handle
break break
@ -831,7 +831,7 @@ def _get_family_handle_record_label (self, record):
individual_family = self.db.get_family_from_handle(individual_family_handle) individual_family = self.db.get_family_from_handle(individual_family_handle)
for event_handle in individual_family.get_event_list(): for event_handle in individual_family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
marriage_event_handle = event_handle marriage_event_handle = event_handle
break break

2
src/plugins/Summary.py
View File

@ -94,7 +94,7 @@ def build_report(database,person):
disconnected = disconnected + 1 disconnected = disconnected + 1
birth_handle = person.get_birth_handle() birth_handle = person.get_birth_handle()
if 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(): if not birth.get_date():
missing_bday = missing_bday + 1 missing_bday = missing_bday + 1
else: else:

8
src/plugins/TimeLine.py
View File

@ -186,13 +186,13 @@ class TimeLine:
p = self.db.get_person_from_handle(p_id) p = self.db.get_person_from_handle(p_id)
b_id = p.get_birth_handle() b_id = p.get_birth_handle()
if b_id: 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: else:
b = Date.UNDEF b = Date.UNDEF
d_id = p.get_death_handle() d_id = p.get_death_handle()
if d_id: 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: else:
d = Date.UNDEF d = Date.UNDEF
@ -284,13 +284,13 @@ class TimeLine:
p = self.db.get_person_from_handle(p_id) p = self.db.get_person_from_handle(p_id)
b_id = p.get_birth_handle() b_id = p.get_birth_handle()
if b_id: 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: else:
b = Date.UNDEF b = Date.UNDEF
d_id = p.get_death_handle() d_id = p.get_death_handle()
if d_id: 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: else:
d = Date.UNDEF d = Date.UNDEF

6
src/plugins/Verify.py
View File

@ -114,7 +114,7 @@ class Verify:
""" """
year = 0 year = 0
if event_handle: 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() dateObj = event.get_date_object()
if dateObj: if dateObj:
if dateObj.get_calendar().NAME != Gregorian.NAME: if dateObj.get_calendar().NAME != Gregorian.NAME:
@ -158,7 +158,7 @@ class Verify:
for event_handle in person.get_event_list(): for event_handle in person.get_event_list():
if event_handle: 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() event_name = event.get_name().lower()
if event.get_name() == "burial": if event.get_name() == "burial":
buryear = get_year( event ) buryear = get_year( event )
@ -318,7 +318,7 @@ class Verify:
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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": if event.get_name() == "Marriage":
marriage_id = event_handle marriage_id = event_handle
break break

10
src/plugins/WebPage.py
View File

@ -516,7 +516,7 @@ class IndividualPage:
for event_handle in event_handle_list: for event_handle in event_handle_list:
if not event_handle: if not event_handle:
continue continue
event = self.db.find_event_from_handle(event_handle) event = self.db.get_event_from_handle(event_handle)
if event.get_privacy(): if event.get_privacy():
continue continue
name = _(event.get_name()) name = _(event.get_name())
@ -654,7 +654,7 @@ class IndividualPage:
if not self.alive: if not self.alive:
for event_handle in family.get_event_list(): for event_handle in family.get_event_list():
if event_handle: 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: if event.get_privacy() == 0:
self.write_fam_fact(event) self.write_fam_fact(event)
@ -804,7 +804,7 @@ class WebReport(Report.Report):
f.write("%s /%s/, %s|" % (firstName,surName, suffix)) f.write("%s /%s/, %s|" % (firstName,surName, suffix))
for e_id in [p.get_birth_handle(),p.get_death_handle()]: for e_id in [p.get_birth_handle(),p.get_death_handle()]:
if e_id: if e_id:
e = self.db.find_event_from_handle(e_id) e = self.db.get_event_from_handle(e_id)
else: else:
continue continue
if e: if e:
@ -889,7 +889,7 @@ class WebReport(Report.Report):
if self.birth_dates: if self.birth_dates:
birth_handle = self.db.get_person_from_handle(person_handle).get_birth_handle() birth_handle = self.db.get_person_from_handle(person_handle).get_birth_handle()
if 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: if self.year_only:
birth_dobj = birth_event.get_date_object() birth_dobj = birth_event.get_date_object()
if birth_dobj.get_year_valid(): if birth_dobj.get_year_valid():
@ -940,7 +940,7 @@ class WebReport(Report.Report):
if self.birth_dates: if self.birth_dates:
birth_handle = self.db.get_person_from_handle(person_handle).get_birth_handle() birth_handle = self.db.get_person_from_handle(person_handle).get_birth_handle()
if 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: if self.year_only:
birth_dobj = birth_event.get_date_object() birth_dobj = birth_event.get_date_object()
if birth_dobj.get_year_valid(): if birth_dobj.get_year_valid():

2
src/plugins/WriteCD.py
View File

@ -234,7 +234,7 @@ class PackageWriter:
p.set_media_list(nl) p.set_media_list(nl)
self.db.commit_place(p,None) self.db.commit_place(p,None)
for key in self.db.get_event_handles(): 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() nl = p.get_media_list()
for o in nl: for o in nl:
if o.get_reference_handle() == self.object_handle: if o.get_reference_handle() == self.object_handle:

2
src/plugins/WritePkg.py
View File

@ -117,7 +117,7 @@ class PackageWriter:
p.set_media_list(nl) p.set_media_list(nl)
self.db.commit_place(p,None) self.db.commit_place(p,None)
for key in self.db.get_event_handles(): 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() nl = p.get_media_list()
for o in nl: for o in nl:
if o.get_reference_handle() == m_id: if o.get_reference_handle() == m_id: