* src/GenericFilter.py: Proper test for place in event-based

filters; (Rule.set_list): Add assertion to have the correct number
of arguments; (various): stop testing for number of arguments.
* src/AddSpouse.py (LikelyFilter): Add labels to the filter.
* src/ChooseParents.py (LikelyFilter): Add labels to the filter.
* src/SelectiChild.py (LikelyFilter): Add labesl to the filter.
* src/gramps_main.py (init_filters): Instantiate filters with
corrent number of arguments.


svn: r4925
This commit is contained in:
Alex Roitman
2005-07-13 19:04:29 +00:00
parent 3e68afe934
commit cc38e20f1d
6 changed files with 57 additions and 39 deletions

View File

@@ -975,7 +975,7 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
all = GenericFilter.ParamFilter()
all.set_name(_("People with names containing..."))
all.add_rule(GenericFilter.SearchName([]))
all.add_rule(GenericFilter.SearchName(['']))
filter_list.append(all)
all = GenericFilter.GenericFilter()
@@ -1025,7 +1025,7 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
all = GenericFilter.ParamFilter()
all.set_name(_("People probably alive"))
all.add_rule(GenericFilter.ProbablyAlive([]))
all.add_rule(GenericFilter.ProbablyAlive(['']))
filter_list.append(all)
all = GenericFilter.GenericFilter()
@@ -1035,17 +1035,17 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
all = GenericFilter.GenericFilter()
all.set_name(_("Witnesses"))
all.add_rule(GenericFilter.IsWitness([]))
all.add_rule(GenericFilter.IsWitness(['','']))
filter_list.append(all)
all = GenericFilter.ParamFilter()
all.set_name(_("People with records containing..."))
all.add_rule(GenericFilter.HasTextMatchingSubstringOf([]))
all.add_rule(GenericFilter.HasTextMatchingSubstringOf(['',0,0]))
filter_list.append(all)
all = GenericFilter.ParamFilter()
all.set_name(_("People with records matching regular expression..."))
all.add_rule(GenericFilter.HasTextMatchingRegexpOf([]))
all.add_rule(GenericFilter.HasTextMatchingRegexpOf(['',0,1]))
filter_list.append(all)
all = GenericFilter.GenericFilter()
@@ -1055,7 +1055,7 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
all = GenericFilter.ParamFilter()
all.set_name(_("People with notes containing..."))
all.add_rule(GenericFilter.HasNoteMatchingSubstringOf([]))
all.add_rule(GenericFilter.HasNoteMatchingSubstringOf(['']))
filter_list.append(all)
self.filter_model = GenericFilter.FilterStore(filter_list)