Now searches spouse, and their familes, for evidence
svn: r14015
This commit is contained in:
parent
2d60b8763a
commit
4093c1060c
@ -627,19 +627,22 @@ class CalcToolManagedWindow(PluginWindows.ToolManagedWindowBatch):
|
|||||||
_("sibling death-related date"),
|
_("sibling death-related date"),
|
||||||
child)
|
child)
|
||||||
|
|
||||||
if not is_spouse: # if you are not doing a spouse lookup, then let's do:
|
if not is_spouse: # if you are not in recursion, let's recurse:
|
||||||
mother_handle = family.get_mother_handle()
|
for family_handle in person.get_family_handle_list():
|
||||||
father_handle = family.get_father_handle()
|
family = self.db.get_family_from_handle(family_handle)
|
||||||
if mother_handle == person.handle and father_handle:
|
if family:
|
||||||
father = self.db.get_person_from_handle(father_handle)
|
mother_handle = family.get_mother_handle()
|
||||||
date1, date2, explain, other = self.calc_estimates(father, is_spouse=True)
|
father_handle = family.get_father_handle()
|
||||||
if date1 and date2:
|
if mother_handle == person.handle and father_handle:
|
||||||
return date1, date2, _("a spouse, ") + explain, other
|
father = self.db.get_person_from_handle(father_handle)
|
||||||
elif father_handle == person.handle and mother_handle:
|
date1, date2, explain, other = self.calc_estimates(father, is_spouse=True)
|
||||||
mother = self.db.get_person_from_handle(mother_handle)
|
if date1 and date2:
|
||||||
date1, date2, explain, other = self.calc_estimates(father, is_spouse=True)
|
return date1, date2, _("a spouse, ") + explain, other
|
||||||
if date1 and date2:
|
elif father_handle == person.handle and mother_handle:
|
||||||
return date1, date2, _("a spouse, ") + explain, other
|
mother = self.db.get_person_from_handle(mother_handle)
|
||||||
|
date1, date2, explain, other = self.calc_estimates(mother, is_spouse=True)
|
||||||
|
if date1 and date2:
|
||||||
|
return date1, date2, _("a spouse, ") + explain, other
|
||||||
|
|
||||||
# Try looking for descendants that were born more than a lifespan
|
# Try looking for descendants that were born more than a lifespan
|
||||||
# ago.
|
# ago.
|
||||||
|
Loading…
Reference in New Issue
Block a user