From ccfd1e57b477bf00e54b2b383a3b2b0ca8008e31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julio=20S=C3=A1nchez?= Date: Sun, 26 Jun 2005 20:55:49 +0000 Subject: [PATCH] * src/GenericFilter.py: Fix uninitialized ancestor_cache in HasCommonAncestorWithFilterMatch, fix or-ing filters svn: r4878 --- gramps2/ChangeLog | 4 ++++ gramps2/src/GenericFilter.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 0935e7666..10bd81135 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2005-06-26 Julio Sanchez + * src/GenericFilter.py: Fix uninitialized ancestor_cache in + HasCommonAncestorWithFilterMatch, fix or-ing filters + 2005-06-24 Martin Hawlisch * src/PeopleView.py (build_people_context_menu): Workaround to get a proper german translation. diff --git a/gramps2/src/GenericFilter.py b/gramps2/src/GenericFilter.py index 3e3dc3470..a7a525ee5 100644 --- a/gramps2/src/GenericFilter.py +++ b/gramps2/src/GenericFilter.py @@ -956,6 +956,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith): def __init__(self,list): HasCommonAncestorWith.__init__(self,list) + self.ancestor_cache = {} def init_ancestor_cache(self,db): filt = MatchesFilter(self.list) @@ -1949,7 +1950,7 @@ class GenericFilter: count += 1 return count != 1 - def and_or(self,db,person): + def or_test(self,db,person): for rule in self.flist: if rule.apply(db,person): return True