* src/plugins.py/rel_xx.py: return order of get_relationship_distance

changed. Not for pt, there that method is inherited.

2007-10-24 Benny Malengier <benny.malengier@gramps-project.org>


svn: r9241
This commit is contained in:
Benny Malengier 2007-10-24 12:52:07 +00:00
parent b3d15e1dca
commit 4e902b6f7a
15 changed files with 50 additions and 16 deletions

View File

@ -1,3 +1,7 @@
2007-10-24 Benny Malengier <benny.malengier@gramps-project.org>
* src/plugins.py/rel_xx.py: return order of get_relationship_distance
changed. Not for pt, there that method is inherited.
2007-10-24 Benny Malengier <benny.malengier@gramps-project.org>
* src/plugins/all_relations.py: collapse parents same family in one line
* src/Relationship.py: change no parent family code

View File

@ -159,7 +159,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) in (str,unicode):

View File

@ -177,7 +177,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -338,7 +338,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -266,7 +266,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -187,7 +187,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -180,7 +180,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse, [])
(firstRel, secondRel, common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel, common) = \
self.get_relationship_distance(db, orig_person, other_person)
if type(common) == types.StringType or \
@ -248,7 +250,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if orig_person == other_person:
return ('', [])
(firstRel, secondRel, common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel, common) = \
self.get_relationship_distance(db, orig_person, other_person)
if type(common) == types.StringType or \

View File

@ -296,7 +296,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
return ("sógora vagy sógornője",self.get_brothersister_in_law_common(orig_person,other_person))
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -155,7 +155,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -111,7 +111,7 @@ _father_level = [ "",
"oudgrootvader (graad 6)",
"oudovergrootvader(graad 7)",
"oudbetovergrootvader (graad 8)",
"stamvader graad 9)",
"stamvader (graad 9)",
"stamgrootvader",
"stamovergrootvader",
"stambetovergrootvader",
@ -310,7 +310,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = self.get_relationship_distance(db,
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = self.get_relationship_distance(db,
orig_person,other_person)
if (type(common) == types.StringType or

View File

@ -237,7 +237,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -259,7 +259,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = self.get_relationship_distance(orig_person,other_person)
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = self.get_relationship_distance(orig_person,other_person)
if type(common) == types.StringType or type(common) == types.UnicodeType:
return (common,[])

View File

@ -211,7 +211,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -159,7 +159,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \

View File

@ -192,7 +192,9 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
if is_spouse:
return (is_spouse,[])
(firstRel,secondRel,common) = \
#get_relationship_distance changed, first data is relation to
#orig person, apperently secondRel in this function
(secondRel,firstRel,common) = \
self.get_relationship_distance(db,orig_person,other_person)
if type(common) == types.StringType or \