From cc28935b158dfabe453a4ea4e16874490d3b4c5c Mon Sep 17 00:00:00 2001 From: SNoiraud Date: Wed, 11 Sep 2019 16:14:05 +0200 Subject: [PATCH] Using regex in the sidebar gives different result from previous gramps release. Fixes #11321 --- .../gui/filters/sidebar/_personsidebarfilter.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gramps/gui/filters/sidebar/_personsidebarfilter.py b/gramps/gui/filters/sidebar/_personsidebarfilter.py index 32f794025..7d11fdc85 100644 --- a/gramps/gui/filters/sidebar/_personsidebarfilter.py +++ b/gramps/gui/filters/sidebar/_personsidebarfilter.py @@ -183,12 +183,17 @@ class PersonSidebarFilter(SidebarFilter): # build a GenericFilter generic_filter = GenericFilter() - # if the name is not empty, choose either the regular expression - # version or the normal text match + # if the name is not empty, split the name in multiple part if + # we don't use regexp. if the regexp is used, don't split the + # field if name: - name_parts = name.split(sep=" ") - for name_part in name_parts: - rule = RegExpName([name_part], use_regex=regex) + if not regex: + name_parts = name.split(sep=" ") + for name_part in name_parts: + rule = RegExpName([name_part], use_regex=regex) + generic_filter.add_rule(rule) + else: + rule = RegExpName([name], use_regex=regex) generic_filter.add_rule(rule) # if the id is not empty, choose either the regular expression