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

* src/Relationship.py: More corrections.

Browse Source 
* src/plugins/rel_ru.py: Corrections.
* src/gramps_main.py: Corrections.


svn: r2842
This commit is contained in:
Alex Roitman
2004-02-15 21:28:31 +00:00
parent 1c94371e33
commit 983186336c
4 changed files with 34 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gramps2/src/Relationship.py
View File

@@ -282,17 +282,7 @@ class RelationshipCalculator:
firstRel = -1
secondRel = -1
length = len(common)
if length == 1:
person_id = common[0]
secondRel = firstMap[person_id]
firstRel = secondMap[person_id]
elif length == 2:
person_id = common[0]
secondRel = firstMap[person_id]
firstRel = secondMap[person_id]
elif length > 2:
if common:
person_id = common[0]
secondRel = firstMap[person_id]
firstRel = secondMap[person_id]
@@ -327,6 +317,7 @@ class RelationshipCalculator:
else:
return (self.get_cousin(secondRel-1,firstRel-secondRel),common)
def get_grandparents_string(self,orig_person,other_person):
"""
returns a string representing the relationshp between the two people,
@@ -345,8 +336,11 @@ class RelationshipCalculator:
if orig_person == other_person:
return ('', [])
self.apply_filter(orig_person,0,firstList,firstMap)
self.apply_filter(other_person,0,secondList,secondMap)
try:
self.apply_filter(orig_person.get_id(),0,firstList,firstMap)
self.apply_filter(other_person.get_id(),0,secondList,secondMap)
except RuntimeError,msg:
return (_("Relationship loop detected"),None)
for person_id in firstList:
if person_id in secondList:
@@ -360,17 +354,7 @@ class RelationshipCalculator:
firstRel = -1
secondRel = -1
length = len(common)
if length == 1:
person_id = common[0]
secondRel = firstMap[person_id]
firstRel = secondMap[person_id]
elif length == 2:
person_id = common[0]
secondRel = firstMap[person_id]
firstRel = secondMap[person_id]
elif length > 2:
if common:
person_id = common[0]
secondRel = firstMap[person_id]
firstRel = secondMap[person_id]