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

* src/GenericFilter.py (ParamFilter.apply): Set parameter list before prepare (solves crash in full text search)

Browse Source 
* src/gramps_main.py: Enable full text search filters again


svn: r4571
This commit is contained in:
Martin Hawlisch 2005-05-12 15:03:17 +00:00
parent 9b606381f9
commit 864e8bb7d4
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps2/ChangeLog
View File

@ -1,3 +1,8 @@
2005-05-12 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/GenericFilter.py (ParamFilter.apply): Set parameter list before
prepare (solves crash in full text search)
* src/gramps_main.py: Enable full text search filters again
2005-05-12 Alex Roitman <shura@gramps-project.org> 2005-05-12 Alex Roitman <shura@gramps-project.org>
* src/plugins/Check.py (cleanup_missing_photos): Typo. * src/plugins/Check.py (cleanup_missing_photos): Typo.
* configure.in: Bump up the version number. * configure.in: Bump up the version number.

4
gramps2/src/GenericFilter.py
View File

@ -2379,10 +2379,10 @@ class ParamFilter(GenericFilter):
self.param_list = [param] self.param_list = [param]
def apply(self,db,id_list): def apply(self,db,id_list):
for rule in self.flist:
rule.prepare(db)
for rule in self.flist: for rule in self.flist:
rule.set_list(self.param_list) rule.set_list(self.param_list)
for rule in self.flist:
rule.prepare(db)
result = GenericFilter.apply(self,db,id_list) result = GenericFilter.apply(self,db,id_list)
for rule in self.flist: for rule in self.flist:
rule.reset() rule.reset()

16
gramps2/src/gramps_main.py
View File

@ -1033,15 +1033,15 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
all.add_rule(GenericFilter.IsWitness([])) all.add_rule(GenericFilter.IsWitness([]))
filter_list.append(all) filter_list.append(all)
# all = GenericFilter.ParamFilter() all = GenericFilter.ParamFilter()
# all.set_name(_("Any textual record contains...")) all.set_name(_("Any textual record contains..."))
# all.add_rule(GenericFilter.HasTextMatchingSubstringOf([])) all.add_rule(GenericFilter.HasTextMatchingSubstringOf([]))
# filter_list.append(all) filter_list.append(all)
# all = GenericFilter.ParamFilter() all = GenericFilter.ParamFilter()
# all.set_name(_("Any textual record matches regular expression...")) all.set_name(_("Any textual record matches regular expression..."))
# all.add_rule(GenericFilter.HasTextMatchingRegexpOf([])) all.add_rule(GenericFilter.HasTextMatchingRegexpOf([]))
# filter_list.append(all) filter_list.append(all)
self.filter_model = GenericFilter.FilterStore(filter_list) self.filter_model = GenericFilter.FilterStore(filter_list)
self.filter_list.set_model(self.filter_model) self.filter_list.set_model(self.filter_model)