Update
svn: r3455
This commit is contained in:
parent
400f7d51b2
commit
72b301338f
@ -144,7 +144,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -335,7 +335,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -179,7 +179,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -143,7 +143,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -262,6 +262,20 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
along with a list of common ancestors (typically father,mother)
|
along with a list of common ancestors (typically father,mother)
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
if orig_person == None:
|
||||||
|
return ("undefined",[])
|
||||||
|
|
||||||
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
|
return ('', [])
|
||||||
|
|
||||||
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
if other_person.get_gender() == RelLib.Person.male:
|
||||||
|
#FIXME: husband
|
||||||
|
return ("spouse",[])
|
||||||
|
else:
|
||||||
|
#FIXME: wife
|
||||||
|
return ("spouse",[])
|
||||||
|
|
||||||
if self.is_fathermother_in_law(other_person,orig_person):
|
if self.is_fathermother_in_law(other_person,orig_person):
|
||||||
if other_person.getGender() == RelLib.Person.male:
|
if other_person.getGender() == RelLib.Person.male:
|
||||||
return ("apósa",self.get_fathermother_in_law_common(other_person,orig_person))
|
return ("apósa",self.get_fathermother_in_law_common(other_person,orig_person))
|
||||||
|
@ -148,7 +148,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("non definito",[])
|
return ("non definito",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -229,7 +229,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -204,7 +204,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
@ -184,7 +184,7 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
|
|||||||
if orig_person == None:
|
if orig_person == None:
|
||||||
return ("undefined",[])
|
return ("undefined",[])
|
||||||
|
|
||||||
if orig_person == other_person:
|
if orig_person.get_handle() == other_person.get_handle():
|
||||||
return ('', [])
|
return ('', [])
|
||||||
|
|
||||||
if self.is_spouse(orig_person,other_person):
|
if self.is_spouse(orig_person,other_person):
|
||||||
|
Loading…
Reference in New Issue
Block a user