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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
gramps2/ChangeLog
View File

@@ -4,7 +4,14 @@
* src/plugins/NavWebPage.py: fix sorting. * src/plugins/NavWebPage.py: fix sorting.
2005-07-13 Alex Roitman <shura@gramps-project.org> 2005-07-13 Alex Roitman <shura@gramps-project.org>
* src/GenericFilter.py: Proper test for place in event-based filters. * 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.
2005-07-13 Don Allingham <don@gramps-project.org> 2005-07-13 Don Allingham <don@gramps-project.org>
* src/GrampsInMemDB.py: add get_event_cursor * src/GrampsInMemDB.py: add get_event_cursor

1
gramps2/src/AddSpouse.py
View File

@@ -389,6 +389,7 @@ class AddSpouse:
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class LikelyFilter(GenericFilter.Rule): class LikelyFilter(GenericFilter.Rule):
labels = [ 'Person handle', 'Person gender' ]
category = _('General filters') category = _('General filters')
def prepare(self,db): def prepare(self,db):

1
gramps2/src/ChooseParents.py
View File

@@ -808,6 +808,7 @@ class ModifyParents:
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class LikelyFilter(GenericFilter.Rule): class LikelyFilter(GenericFilter.Rule):
labels = [ 'Person handle' ]
category = _('General filters') category = _('General filters')
def prepare(self,db): def prepare(self,db):

56
gramps2/src/GenericFilter.py
View File

@@ -102,6 +102,9 @@ class Rule:
def set_list(self,list): def set_list(self,list):
assert type(list) == type([]) or list == None, "Argument is not a list" assert type(list) == type([]) or list == None, "Argument is not a list"
assert len(list) == len(self.labels), \
"Number of arguments does not match number of labels.\n"\
"list: %s\nlabels: %s" % (list,self.labels)
self.list = list self.list = list
def values(self): def values(self):
@@ -1002,7 +1005,7 @@ class HasEvent(Rule):
def prepare(self,db): def prepare(self,db):
self.date = None self.date = None
try: try:
if self.list and self.list[1]: if self.list[1]:
self.date = DateHandler.parser.parse(self.list[1]) self.date = DateHandler.parser.parse(self.list[1])
except: pass except: pass
@@ -1051,9 +1054,10 @@ class HasFamilyEvent(Rule):
def prepare(self,db): def prepare(self,db):
self.date = None self.date = None
try: try:
if self.list and self.list[1]: if self.list[1]:
self.date = DateHandler.parser.parse(self.list[1]) self.date = DateHandler.parser.parse(self.list[1])
except: pass except:
pass
def apply(self,db,person): def apply(self,db,person):
for f_id in person.get_family_handle_list(): for f_id in person.get_family_handle_list():
@@ -1151,7 +1155,7 @@ class HasBirth(Rule):
def __init__(self,list): def __init__(self,list):
Rule.__init__(self,list) Rule.__init__(self,list)
if self.list and self.list[0]: if self.list[0]:
self.date = DateHandler.parser.parse(self.list[0]) self.date = DateHandler.parser.parse(self.list[0])
else: else:
self.date = None self.date = None
@@ -1162,17 +1166,17 @@ class HasBirth(Rule):
return False return False
event = db.get_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
ed = event.get_description().upper() ed = event.get_description().upper()
if len(self.list) > 2 and self.list[2] \ if self.list[2] \
and ed.find(self.list[2].upper())==-1: and ed.find(self.list[2].upper())==-1:
return False return False
if self.date: if self.date:
if date_cmp(self.date,event.get_date_object()) == 0: if date_cmp(self.date,event.get_date_object()) == 0:
return False return False
if len(self.list)>1 and self.list[1]: if self.list[1]:
pl_id = event.get_place_handle() pl_id = event.get_place_handle()
if pl_id: if pl_id:
pl = db.get_place_from_handle(pl_id) pl = db.get_place_from_handle(pl_id)
pn = pl.get_title().upper pn = pl.get_title().upper()
if pn.find(self.list[1].upper()) == -1: if pn.find(self.list[1].upper()) == -1:
return False return False
else: else:
@@ -1194,7 +1198,7 @@ class HasDeath(Rule):
def __init__(self,list): def __init__(self,list):
Rule.__init__(self,list) Rule.__init__(self,list)
if self.list and self.list[0]: if self.list[0]:
self.date = DateHandler.parser.parse(self.list[0]) self.date = DateHandler.parser.parse(self.list[0])
else: else:
self.date = None self.date = None
@@ -1205,13 +1209,13 @@ class HasDeath(Rule):
return False return False
event = db.get_event_from_handle(event_handle) event = db.get_event_from_handle(event_handle)
ed = event.get_description().upper() ed = event.get_description().upper()
if len(self.list)>2 and self.list[2] \ if self.list[2] \
and ed.find(self.list[2].upper())==-1: and ed.find(self.list[2].upper())==-1:
return False return False
if self.date: if self.date:
if date_cmp(self.date,event.get_date_object()) == 0: if date_cmp(self.date,event.get_date_object()) == 0:
return False return False
if len(self.list)>1 and self.list[1]: if self.list[1]:
pl_id = event.get_place_handle() pl_id = event.get_place_handle()
if pl_id: if pl_id:
pl = db.get_place_from_handle(pl_id) pl = db.get_place_from_handle(pl_id)
@@ -1602,21 +1606,17 @@ class IsWitness(Rule):
return person.handle in self.map return person.handle in self.map
def build_witness_list(self): def build_witness_list(self):
event_type = None
if self.list and self.list[0]:
event_type = self.list[0]
if not self.list or event_type:
for person_handle in self.db.get_person_handles(): for person_handle in self.db.get_person_handles():
p = self.db.get_person_from_handle(person_handle) p = self.db.get_person_from_handle(person_handle)
self.get_witness_of_events( event_type, self.get_witness_of_events(self.list[0],
p.get_event_list()+[p.get_birth_handle(), p.get_death_handle()]) p.get_event_list()+
event_type = None [p.get_birth_handle(),
if self.list and self.list[1]: p.get_death_handle()]
event_type = self.list[1] )
if not self.list or event_type:
for family_handle in self.db.get_family_handles(): for family_handle in self.db.get_family_handles():
f = self.db.get_family_from_handle(family_handle) f = self.db.get_family_from_handle(family_handle)
self.get_witness_of_events(event_type, f.get_event_list()) self.get_witness_of_events(self.list[1],f.get_event_list())
def get_witness_of_events(self, event_type, event_list): def get_witness_of_events(self, event_type, event_list):
if not event_list: if not event_list:
@@ -1681,7 +1681,7 @@ class HasTextMatchingSubstringOf(Rule):
def apply(self,db,person): def apply(self,db,person):
if person.handle in self.person_map: # Cached by matching Source? if person.handle in self.person_map: # Cached by matching Source?
return self.person_map[handle] return self.person_map[person.handle]
if self.match_object(person): # first match the person itself if self.match_object(person): # first match the person itself
return True return True
for event_handle in person.get_event_list()+[person.get_birth_handle(), person.get_death_handle()]: for event_handle in person.get_event_list()+[person.get_birth_handle(), person.get_death_handle()]:
@@ -1852,7 +1852,7 @@ class HasNoteMatchingSubstringOf(Rule):
def apply(self,db,person): def apply(self,db,person):
n = person.get_note() n = person.get_note()
if n: if n:
return n.find(self.list[0]) != -1 return n.upper().find(self.list[0].upper()) != -1
return False return False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@@ -2286,7 +2286,15 @@ class ParamFilter(GenericFilter):
def apply(self,db,id_list=None): def apply(self,db,id_list=None):
for rule in self.flist: for rule in self.flist:
rule.set_list(self.param_list) #rule.set_list(self.param_list)
#
# The above breaks filters with more than one param
# Need to change existing params one by one to keep
# the correct number of arguments
new_list = rule.list[:]
for ix in range(len(self.param_list)):
new_list[ix] = self.param_list[ix]
rule.set_list(new_list)
for rule in self.flist: for rule in self.flist:
rule.prepare(db) rule.prepare(db)
result = GenericFilter.apply(self,db,id_list) result = GenericFilter.apply(self,db,id_list)

1
gramps2/src/SelectChild.py
View File

@@ -302,6 +302,7 @@ class SelectChild:
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class LikelyFilter(GenericFilter.Rule): class LikelyFilter(GenericFilter.Rule):
labels = [ 'Person handle' ]
category = _('General filters') category = _('General filters')
def prepare(self,db): def prepare(self,db):

12
gramps2/src/gramps_main.py
View File

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