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

* src/GenericFilter.py: Resolve handle-person mixup +many other bugfixes

Browse Source 
svn: r4855
This commit is contained in:
Martin Hawlisch 2005-06-21 09:50:18 +00:00
parent 6730d35232
commit 5676035276
2 changed files with 67 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@ -1,3 +1,6 @@
2005-06-21 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/GenericFilter.py: Resolve handle-person mixup +many other bugfixes
2005-06-20 Don Allingham <don@gramps-project.org> 2005-06-20 Don Allingham <don@gramps-project.org>
* src/AddSpouse.py: accept Person instead of handle * src/AddSpouse.py: accept Person instead of handle
* src/ChooseParents.py: accept Person instead of handle * src/ChooseParents.py: accept Person instead of handle

144
gramps2/src/GenericFilter.py
View File

@ -369,8 +369,8 @@ class IsDescendantOf(Rule):
except IndexError: except IndexError:
first = True first = True
try: try:
root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() root_person = db.get_person_from_gramps_id(self.list[0])
self.init_list(root_handle,first) self.init_list(root_person,first)
except: except:
pass pass
@ -380,18 +380,17 @@ class IsDescendantOf(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_list(self,handle,first): def init_list(self,person,first):
if not handle: if not person:
return return
if not first: if not first:
self.map[handle] = 1 self.map[person.handle] = 1
p = self.db.get_person_from_handle(handle) for fam_id in person.get_family_handle_list():
for fam_id in p.get_family_handle_list():
fam = self.db.get_family_from_handle(fam_id) fam = self.db.get_family_from_handle(fam_id)
if fam: if fam:
for child_handle in fam.get_child_handle_list(): for child_handle in fam.get_child_handle_list():
self.init_list(child_handle,0) self.init_list(self.db.get_person_from_handle(child_handle),0)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -425,8 +424,9 @@ class IsDescendantOfFilterMatch(IsDescendantOf):
filt = MatchesFilter(self.list) filt = MatchesFilter(self.list)
filt.prepare(db) filt.prepare(db)
for person_handle in db.get_person_handles(sort_handles=False): for person_handle in db.get_person_handles(sort_handles=False):
if filt.apply (db, person_handle): person = db.get_person_from_handle( person_handle)
self.init_list (person_handle,first) if filt.apply (db, person):
self.init_list (person,first)
filt.reset() filt.reset()
def reset(self): def reset(self):
@ -454,8 +454,8 @@ class IsLessThanNthGenerationDescendantOf(Rule):
self.db = db self.db = db
self.map = {} self.map = {}
try: try:
root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() root_person = db.get_person_from_gramps_id(self.list[0])
self.init_list(root_handle,0) self.init_list(root_person,0)
except: except:
pass pass
@ -465,19 +465,18 @@ class IsLessThanNthGenerationDescendantOf(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_list(self,handle,gen): def init_list(self,person,gen):
if not handle: if not person:
return return
if gen: if gen:
self.map[handle] = 1 self.map[person.handle] = 1
if gen >= int(self.list[1]): if gen >= int(self.list[1]):
return return
p = self.db.get_person_from_handle(handle) for fam_id in person.get_family_handle_list():
for fam_id in p.get_family_handle_list():
fam = self.db.get_family_from_handle(fam_id) fam = self.db.get_family_from_handle(fam_id)
for child_handle in fam.get_child_handle_list(): for child_handle in fam.get_child_handle_list():
self.init_list(child_handle,gen+1) self.init_list(self.db.get_person_from_handle(child_handle),gen+1)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -499,8 +498,8 @@ class IsMoreThanNthGenerationDescendantOf(Rule):
self.db = db self.db = db
self.map = {} self.map = {}
try: try:
root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() root_person = db.get_person_from_gramps_id(self.list[0])
self.init_list(root_handle,0) self.init_list(root_person,0)
except: except:
pass pass
@ -510,17 +509,16 @@ class IsMoreThanNthGenerationDescendantOf(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_list(self,handle,gen): def init_list(self,person,gen):
if not handle: if not person:
return return
if gen >= int(self.list[1]): if gen >= int(self.list[1]):
self.map[handle] = 1 self.map[person.handle] = 1
p = self.db.get_person_from_handle(handle) for fam_id in person.get_family_handle_list():
for fam_id in p.get_family_handle_list():
fam = self.db.get_family_from_handle(fam_id) fam = self.db.get_family_from_handle(fam_id)
for child_handle in fam.get_child_handle_list(): for child_handle in fam.get_child_handle_list():
self.init_list(child_handle,gen+1) self.init_list(self.db.get_person_from_handle(child_handle),gen+1)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -542,8 +540,9 @@ class IsChildOfFilterMatch(Rule):
filt = MatchesFilter(self.list) filt = MatchesFilter(self.list)
filt.prepare(db) filt.prepare(db)
for person_handle in db.get_person_handles(sort_handles=False): for person_handle in db.get_person_handles(sort_handles=False):
if filt.apply (db, person_handle): person = db.get_person_from_handle( person_handle)
self.init_list (person_handle) if filt.apply (db, person):
self.init_list (person)
filt.reset() filt.reset()
def reset(self): def reset(self):
@ -552,11 +551,10 @@ class IsChildOfFilterMatch(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_list(self,handle): def init_list(self,person):
if not handle: if not person:
return return
p = self.db.get_person_from_handle(handle) for fam_id in person.get_family_handle_list():
for fam_id in p.get_family_handle_list():
fam = self.db.get_family_from_handle(fam_id) fam = self.db.get_family_from_handle(fam_id)
for child_handle in fam.get_child_handle_list(): for child_handle in fam.get_child_handle_list():
self.map[child_handle] = 1 self.map[child_handle] = 1
@ -580,8 +578,9 @@ class IsSiblingOfFilterMatch(Rule):
filt = MatchesFilter(self.list) filt = MatchesFilter(self.list)
filt.prepare(db) filt.prepare(db)
for person_handle in db.get_person_handles(sort_handles=False): for person_handle in db.get_person_handles(sort_handles=False):
if filt.apply (db, person_handle): person = db.get_person_from_handle( person_handle)
self.init_list (person_handle) if filt.apply (db, person):
self.init_list (person)
filt.reset() filt.reset()
def reset(self): def reset(self):
@ -590,11 +589,10 @@ class IsSiblingOfFilterMatch(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_list(self,handle): def init_list(self,person):
if not handle: if not person:
return return
p = self.db.get_person_from_handle(handle) fam_id = person.get_main_parents_family_handle()
fam_id = p.get_main_parents_family_handle()
fam = self.db.get_family_from_handle(fam_id) fam = self.db.get_family_from_handle(fam_id)
if fam: if fam:
for child_handle in fam.get_child_handle_list(): for child_handle in fam.get_child_handle_list():
@ -620,7 +618,7 @@ class IsDescendantFamilyOf(Rule):
self.map = {} self.map = {}
self.orig_handle = person.handle self.orig_handle = person.handle
self.db = db self.db = db
return self.search(handle,1) return self.search(person.handle,1)
def search(self,handle,val): def search(self,handle,val):
try: try:
@ -674,8 +672,8 @@ class IsAncestorOf(Rule):
except IndexError: except IndexError:
first = 1 first = 1
try: try:
root_handle = db.get_person_from_gramps_id(self.list[0]).get_handle() root_person = db.get_person_from_gramps_id(self.list[0])
self.init_ancestor_list(db,root_handle,first) self.init_ancestor_list(db,root_person,first)
except: except:
pass pass
@ -685,23 +683,22 @@ class IsAncestorOf(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_ancestor_list(self,db,handle,first): def init_ancestor_list(self,db,person,first):
if not handle: if not person:
return return
if not first: if not first:
self.map[handle] = 1 self.map[person.handle] = 1
p = db.get_person_from_handle(handle) fam_id = person.get_main_parents_family_handle()
fam_id = p.get_main_parents_family_handle()
fam = db.get_family_from_handle(fam_id) fam = db.get_family_from_handle(fam_id)
if fam: if fam:
f_id = fam.get_father_handle() f_id = fam.get_father_handle()
m_id = fam.get_mother_handle() m_id = fam.get_mother_handle()
if f_id: if f_id:
self.init_ancestor_list(db,f_id,0) self.init_ancestor_list(db,db.get_person_from_handle(f_id),0)
if m_id: if m_id:
self.init_ancestor_list(db,m_id,0) self.init_ancestor_list(db,db.get_person_from_handle(m_id),0)
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -736,8 +733,9 @@ class IsAncestorOfFilterMatch(IsAncestorOf):
filt = MatchesFilter(self.list) filt = MatchesFilter(self.list)
filt.prepare(db) filt.prepare(db)
for person_handle in db.get_person_handles(sort_handles=False): for person_handle in db.get_person_handles(sort_handles=False):
if filt.apply (db, person_handle): person = db.get_person_from_handle( person_handle)
self.init_ancestor_list (db,person_handle,first) if filt.apply (db, person):
self.init_ancestor_list (db,person,first)
filt.reset() filt.reset()
def reset(self): def reset(self):
@ -868,8 +866,9 @@ class IsParentOfFilterMatch(Rule):
filt = MatchesFilter(self.list) filt = MatchesFilter(self.list)
filt.prepare(db) filt.prepare(db)
for person_handle in db.get_person_handles(sort_handles=False): for person_handle in db.get_person_handles(sort_handles=False):
if filt.apply (db, person_handle): person = db.get_person_from_handle(person_handle)
self.init_list (person_handle) if filt.apply (db, person):
self.init_list (person)
filt.reset() filt.reset()
def reset(self): def reset(self):
@ -878,9 +877,8 @@ class IsParentOfFilterMatch(Rule):
def apply(self,db,person): def apply(self,db,person):
return self.map.has_key(person.handle) return self.map.has_key(person.handle)
def init_list(self,handle): def init_list(self,person):
p = self.db.get_person_from_handle(handle) for fam_id,frel,mrel in person.get_parent_family_handle_list():
for fam_id,frel,mrel in p.get_parent_family_handle_list():
fam = self.db.get_family_from_handle(fam_id) fam = self.db.get_family_from_handle(fam_id)
for parent_id in [fam.get_father_handle (), fam.get_mother_handle ()]: for parent_id in [fam.get_father_handle (), fam.get_mother_handle ()]:
if parent_id: if parent_id:
@ -953,7 +951,7 @@ class HasCommonAncestorWithFilterMatch(HasCommonAncestorWith):
def init(self,h): self.ancestor_cache[h] = 1 def init(self,h): self.ancestor_cache[h] = 1
for handle in db.get_person_handles(sort_handles=False): for handle in db.get_person_handles(sort_handles=False):
if (not self.ancestor_cache.has_key (handle) if (not self.ancestor_cache.has_key (handle)
and filt.apply (db, handle)): and filt.apply (db, db.get_person_from_handle(handle))):
for_each_ancestor(db,[handle],init,self) for_each_ancestor(db,[handle],init,self)
filt.reset() filt.reset()
@ -1297,10 +1295,9 @@ class SearchName(Rule):
description = _("Matches people with a specified (partial) name") description = _("Matches people with a specified (partial) name")
category = _('General filters') category = _('General filters')
def apply(self,db,handle): def apply(self,db,person):
self.f = self.list[0] self.f = self.list[0]
p = db.get_person_from_handle(handle) n = NameDisplay.displayer.display(person)
n = NameDisplay.displayer.display(p)
return self.f and n.upper().find(self.f.upper()) != -1 return self.f and n.upper().find(self.f.upper()) != -1
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -1356,13 +1353,13 @@ class MatchesFilter(Rule):
for rule in filt.flist: for rule in filt.flist:
rule.reset() rule.reset()
def apply(self,db,handle): def apply(self,db,person):
for filt in SystemFilters.get_filters(): for filt in SystemFilters.get_filters():
if filt.get_name() == self.list[0]: if filt.get_name() == self.list[0]:
return filt.check(handle) return filt.check(person.handle)
for filt in CustomFilters.get_filters(): for filt in CustomFilters.get_filters():
if filt.get_name() == self.list[0]: if filt.get_name() == self.list[0]:
return filt.check(db,handle) return filt.check(db,person.handle)
return False return False
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -1386,9 +1383,9 @@ class IsSpouseOfFilterMatch(Rule):
for spouse_id in [family.get_father_handle (), family.get_mother_handle ()]: for spouse_id in [family.get_father_handle (), family.get_mother_handle ()]:
if not spouse_id: if not spouse_id:
continue continue
if spouse_id == handle: if spouse_id == person.handle:
continue continue
if filt.apply (db, spouse_id): if filt.apply (db, db.get_person_from_handle( spouse_id)):
return True return True
return False return False
@ -1404,7 +1401,7 @@ class HaveAltFamilies(Rule):
def apply(self,db,person): def apply(self,db,person):
for (fam,rel1,rel2) in person.get_parent_family_handle_list(): for (fam,rel1,rel2) in person.get_parent_family_handle_list():
if rel1 == RelLib.Person.CHILD_ADOPTED or rel2 == RelLib.Person.CHILD_ADOPTED: if rel1 == RelLib.Person.CHILD_REL_ADOPT or rel2 == RelLib.Person.CHILD_REL_ADOPT:
return True return True
return False return False
@ -1647,14 +1644,12 @@ class HasTextMatchingSubstringOf(Rule):
self.regexp_match = False self.regexp_match = False
except IndexError: except IndexError:
self.regexp_match = False self.regexp_match = False
self.cache_repos()
self.cache_sources() self.cache_sources()
def reset(self): def reset(self):
self.person_map = {} self.person_map = {}
self.event_map = {} self.event_map = {}
self.source_map = {} self.source_map = {}
self.repo_map = {}
self.family_map = {} self.family_map = {}
self.place_map = {} self.place_map = {}
self.media_map = {} self.media_map = {}
@ -1733,22 +1728,11 @@ class HasTextMatchingSubstringOf(Rule):
self.media_map[media_handle] = self.match_object(media) self.media_map[media_handle] = self.match_object(media)
return self.media_map[media_handle] return self.media_map[media_handle]
def cache_repos(self):
# search all matching repositories
for repo_handle in self.db.get_repository_handles():
repo = self.db.get_repository_from_handle(repo_handle)
if( self.match_object(repo)):
self.repo_map[repo_handle] = 1
def cache_sources(self): def cache_sources(self):
# search all sources and match all referents of a matching source # search all sources and match all referents of a matching source
for source_handle in self.db.get_source_handles(): for source_handle in self.db.get_source_handles():
source = self.db.get_source_from_handle(source_handle) source = self.db.get_source_from_handle(source_handle)
match = self.match_object(source) match = self.match_object(source)
if not match:
for reporef in source.get_reporef_list():
if reporef.get_reference_handle() in self.repo_map:
match = 1
if match: if match:
(person_list,family_list,event_list, (person_list,family_list,event_list,
place_list,source_list,media_list place_list,source_list,media_list
@ -1967,7 +1951,7 @@ class GenericFilter:
return m return m
def check(self,db,handle): def check(self,db,handle):
return self.get_check_func()(db,handle) return self.get_check_func()(db,[handle])
def apply(self,db,id_list=None): def apply(self,db,id_list=None):
m = self.get_check_func() m = self.get_check_func()
@ -2243,7 +2227,7 @@ class ParamFilter(GenericFilter):
def set_parameter(self,param): def set_parameter(self,param):
self.param_list = [param] self.param_list = [param]
def apply(self,db,id_list): 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)
for rule in self.flist: for rule in self.flist: