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

In familysidebarfilter, search on each part of name (#1138)

Browse Source 
Instead of requiring that the entire search string matches a single
one of the Person's names, the function will require that each word
in the search string matches any of the Person's name fields.

Fixes #12023
This commit is contained in:
Paul Culley
2021-05-06 10:31:48 -05:00
committed by GitHub
parent f4b88100b1
commit a7e4d136b8
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
gramps/gui/filters/sidebar/_familysidebarfilter.py
View File

@@ -163,16 +163,43 @@ class FamilySidebarFilter(SidebarFilter):
generic_filter.add_rule(rule) generic_filter.add_rule(rule)
if father: if father:
rule = RegExpFatherName([father], use_regex=regex) # if the name is not empty, split the name in multiple part if
generic_filter.add_rule(rule) # we don't use regexp. if the regexp is used, don't split the
# field
if not regex:
name_parts = father.split(sep=" ")
for name_part in name_parts:
rule = RegExpFatherName([name_part], use_regex=regex)
generic_filter.add_rule(rule)
else:
rule = RegExpFatherName([father], use_regex=regex)
generic_filter.add_rule(rule)
if mother: if mother:
rule = RegExpMotherName([mother], use_regex=regex) # if the name is not empty, split the name in multiple part if
generic_filter.add_rule(rule) # we don't use regexp. if the regexp is used, don't split the
# field
if not regex:
name_parts = mother.split(sep=" ")
for name_part in name_parts:
rule = RegExpMotherName([name_part], use_regex=regex)
generic_filter.add_rule(rule)
else:
rule = RegExpMotherName([mother], use_regex=regex)
generic_filter.add_rule(rule)
if child: if child:
rule = RegExpChildName([child], use_regex=regex) # if the name is not empty, split the name in multiple part if
generic_filter.add_rule(rule) # we don't use regexp. if the regexp is used, don't split the
# field
if not regex:
name_parts = child.split(sep=" ")
for name_part in name_parts:
rule = RegExpChildName([name_part], use_regex=regex)
generic_filter.add_rule(rule)
else:
rule = RegExpChildName([child], use_regex=regex)
generic_filter.add_rule(rule)
if etype: if etype:
rule = HasEvent([etype, '', '', '', ''], use_regex=regex) rule = HasEvent([etype, '', '', '', ''], use_regex=regex)