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

* src/plugins/rel_da.py: Convert to new interface. Add to CVS.

Browse Source 
* src/plugins/rel_fi.py: Convert to new interface. Add to CVS.
* src/plugins/rel_fr.py: Convert to new interface. Add to CVS.
* src/plugins/rel_no.py: Convert to new interface. Add to CVS.
* src/plugins/rel_sv.py: Convert to new interface. Add to CVS.
* src/plugins/Makefile.am: Ship new files.
* src/Relationship.py (apply_filter): Keep gender info of all
member in the relationship chain, not just number of generations;
(is_spouse): correctly compare handles; (get_relationship_distance,
get_relationship, get_grandparents_string): correctly use apply_filter.
* src/plugins/rel_it.py (get_relationship): Correctly use apply_filter.
* src/plugins/rel_hu.py (get_relationship): Correctly use apply_filter.
* src/plugins/rel_de.py (is_spouse): Remove function;
(get_relationship): Correctly use apply_filter.
* src/plugins/rel_ru.py (is_spouse): Remove function;
(get_relationship): Correctly use apply_filter.


svn: r3452
This commit is contained in:
Alex Roitman
2004-08-20 19:10:01 +00:00
parent 7d259a6349
commit 96ab4c4bdb
12 changed files with 1196 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gramps2/src/Relationship.py
View File

@@ -163,19 +163,19 @@ class RelationshipCalculator:
def set_db(self,db):
self.db = db
def apply_filter(self,person,index,plist,pmap):
def apply_filter(self,person,rel_str,plist,pmap):
if person == None:
return
plist.append(person.get_handle())
pmap[person.get_handle()] = index
pmap[person.get_handle()] = rel_str
family_handle = person.get_main_parents_family_handle()
if family_handle != None:
family = self.db.get_family_from_handle(family_handle)
father = self.db.get_person_from_handle(family.get_father_handle())
mother = self.db.get_person_from_handle(family.get_mother_handle())
self.apply_filter(father,index+1,plist,pmap)
self.apply_filter(mother,index+1,plist,pmap)
self.apply_filter(father,rel_str+'f',plist,pmap)
self.apply_filter(mother,rel_str+'m',plist,pmap)
def get_cousin(self,level,removed):
if removed > len(_removed_level)-1 or level>len(_level_name)-1:
@@ -241,7 +241,7 @@ class RelationshipCalculator:
for f in orig.get_family_handle_list():
family = self.db.get_family_from_handle(f)
if family:
if other == family.get_father_handle() or other == family.get_mother_handle():
if other.get_handle() == family.get_father_handle() or other.get_handle() == family.get_mother_handle():
return 1
else:
return 0
@@ -271,14 +271,14 @@ class RelationshipCalculator:
rank = 9999999
try:
self.apply_filter(orig_person,0,firstList,firstMap)
self.apply_filter(other_person,0,secondList,secondMap)
self.apply_filter(orig_person,'',firstList,firstMap)
self.apply_filter(other_person,'',secondList,secondMap)
except RuntimeError:
return (firstRel,secondRel,_("Relationship loop detected"))
for person_handle in firstList:
if person_handle in secondList:
new_rank = firstMap[person_handle]
new_rank = len(firstMap[person_handle])
if new_rank < rank:
rank = new_rank
common = [ person_handle ]
@@ -316,6 +316,9 @@ class RelationshipCalculator:
else:
return ("",[])
firstRel = len(firstRel)
secondRel = len(secondRel)
if firstRel == 0:
if secondRel == 0:
return ('',common)
@@ -365,10 +368,10 @@ class RelationshipCalculator:
else:
return ("",[])
if firstRel == 0:
if secondRel == 0:
if len(firstRel) == 0:
if len(secondRel) == 0:
return ('',common)
else:
return (self.get_parents(secondRel),common)
return (self.get_parents(len(secondRel)),common)
else:
return None