From 4e902b6f7a365ae9534a5a3daff40323bae03486 Mon Sep 17 00:00:00 2001 From: Benny Malengier Date: Wed, 24 Oct 2007 12:52:07 +0000 Subject: [PATCH] * 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 svn: r9241 --- ChangeLog | 4 ++++ src/plugins/rel_cs.py | 4 +++- src/plugins/rel_da.py | 4 +++- src/plugins/rel_de.py | 4 +++- src/plugins/rel_es.py | 4 +++- src/plugins/rel_fi.py | 4 +++- src/plugins/rel_fr.py | 8 ++++++-- src/plugins/rel_hu.py | 4 +++- src/plugins/rel_it.py | 4 +++- src/plugins/rel_nl.py | 6 ++++-- src/plugins/rel_no.py | 4 +++- src/plugins/rel_pt.py | 4 +++- src/plugins/rel_ru.py | 4 +++- src/plugins/rel_sk.py | 4 +++- src/plugins/rel_sv.py | 4 +++- 15 files changed, 50 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0cd78e5c4..75a0ba492 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-10-24 Benny Malengier + * 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 * src/plugins/all_relations.py: collapse parents same family in one line * src/Relationship.py: change no parent family code diff --git a/src/plugins/rel_cs.py b/src/plugins/rel_cs.py index 0c73c2cad..e7069da15 100644 --- a/src/plugins/rel_cs.py +++ b/src/plugins/rel_cs.py @@ -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): diff --git a/src/plugins/rel_da.py b/src/plugins/rel_da.py index 0132b4eab..3c6b69e82 100644 --- a/src/plugins/rel_da.py +++ b/src/plugins/rel_da.py @@ -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 \ diff --git a/src/plugins/rel_de.py b/src/plugins/rel_de.py index 0ca248b6a..4d76cc0d6 100644 --- a/src/plugins/rel_de.py +++ b/src/plugins/rel_de.py @@ -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 \ diff --git a/src/plugins/rel_es.py b/src/plugins/rel_es.py index 4b8717768..949a3c0d7 100644 --- a/src/plugins/rel_es.py +++ b/src/plugins/rel_es.py @@ -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 \ diff --git a/src/plugins/rel_fi.py b/src/plugins/rel_fi.py index bb93af9b1..0d4dfac66 100644 --- a/src/plugins/rel_fi.py +++ b/src/plugins/rel_fi.py @@ -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 \ diff --git a/src/plugins/rel_fr.py b/src/plugins/rel_fr.py index 58d55e7e4..57163d14a 100644 --- a/src/plugins/rel_fr.py +++ b/src/plugins/rel_fr.py @@ -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 \ diff --git a/src/plugins/rel_hu.py b/src/plugins/rel_hu.py index df46f57cd..b82c25acc 100644 --- a/src/plugins/rel_hu.py +++ b/src/plugins/rel_hu.py @@ -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 \ diff --git a/src/plugins/rel_it.py b/src/plugins/rel_it.py index bfa9601c3..284e3bedf 100644 --- a/src/plugins/rel_it.py +++ b/src/plugins/rel_it.py @@ -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 \ diff --git a/src/plugins/rel_nl.py b/src/plugins/rel_nl.py index f43c8e463..b38a2a2b0 100644 --- a/src/plugins/rel_nl.py +++ b/src/plugins/rel_nl.py @@ -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 diff --git a/src/plugins/rel_no.py b/src/plugins/rel_no.py index 4fb76ca59..4559bb257 100644 --- a/src/plugins/rel_no.py +++ b/src/plugins/rel_no.py @@ -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 \ diff --git a/src/plugins/rel_pt.py b/src/plugins/rel_pt.py index 2cd6de40c..9ce6dc653 100644 --- a/src/plugins/rel_pt.py +++ b/src/plugins/rel_pt.py @@ -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,[]) diff --git a/src/plugins/rel_ru.py b/src/plugins/rel_ru.py index d1714c5ef..dda68f1d8 100644 --- a/src/plugins/rel_ru.py +++ b/src/plugins/rel_ru.py @@ -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 \ diff --git a/src/plugins/rel_sk.py b/src/plugins/rel_sk.py index e1378c832..d40eb1a50 100644 --- a/src/plugins/rel_sk.py +++ b/src/plugins/rel_sk.py @@ -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 \ diff --git a/src/plugins/rel_sv.py b/src/plugins/rel_sv.py index 71752a052..6990e127b 100644 --- a/src/plugins/rel_sv.py +++ b/src/plugins/rel_sv.py @@ -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 \