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

9341: _deeprelationshippath filter rule, addition of filter rules and classname

Browse Source
This commit is contained in:
SNoiraud 2016-08-21 16:14:12 +02:00
parent 683edca122
commit bb75e6eea8
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gen/filters/rules/person/_deeprelationshippathbetween.py
View File

@ -68,7 +68,7 @@ def get_family_handle_people(db, exclude_handle, family_handle):
def possibly_add_handle(h): def possibly_add_handle(h):
if h != None and h != exclude_handle: if h != None and h != exclude_handle:
people.add(db.get_person_from_handle(h)) people.add(h)
possibly_add_handle(family.get_father_handle()) possibly_add_handle(family.get_father_handle())
possibly_add_handle(family.get_mother_handle()) possibly_add_handle(family.get_mother_handle())
@ -95,6 +95,9 @@ def find_deep_relations(db, progress, person, path, seen, target_people):
if len(target_people) < 1: if len(target_people) < 1:
return [] return []
if person is None:
return []
handle = person.get_handle() handle = person.get_handle()
if handle in seen: if handle in seen:
return [] return []
@ -109,7 +112,8 @@ def find_deep_relations(db, progress, person, path, seen, target_people):
family_people = get_person_family_people(db, person, handle) family_people = get_person_family_people(db, person, handle)
for family_person in family_people: for family_person in family_people:
return_paths += find_deep_relations(db, progress, family_person, person_path, seen, target_people) pers = db.get_person_from_handle(family_person)
return_paths += find_deep_relations(db, progress, pers, person_path, seen, target_people)
if progress: progress.step() if progress: progress.step()
return return_paths return return_paths