Update

svn: r2851

src/plugins/Ancestors.py

@@ -127,9 +127,9 @@ class ComprehensiveAncestorsReport (Report.Report):
 
         self.write_paragraphs (self.person (self.start.get_id(), suppress_children = 1,
                                             needs_name = 1))
-        families = [self.start.get_main_parents_family_id ()]
+        family_ids = [self.start.get_main_parents_family_id ()]
-        if len (families) > 0:
+        if len (family_ids) > 0:
-            self.generation (self.max_generations, families, [], [self.start])
+            self.generation (self.max_generations, family_ids, [], [self.start])
 
         if len (self.sources) > 0:
             self.doc.start_paragraph ("AR-Heading")
@@ -218,16 +218,16 @@ class ComprehensiveAncestorsReport (Report.Report):
 
         return ret
 
-    def generation (self, generations, pfamilies, mfamilies,
+    def generation (self, generations, pfamily_ids, mfamily_ids,
                     already_described, thisgen = 2):
-        if generations > 1 and (len (pfamilies) + len (mfamilies)):
+        if generations > 1 and (len (pfamily_ids) + len (mfamily_ids)):
             people = []
-            for family in pfamilies:
+            for family_id in pfamily_ids:
-                people.extend (self.family (family, already_described))
+                people.extend (self.family (family_id, already_described))
 
-            if thisgen > 2 and len (mfamilies):
+            if thisgen > 2 and len (mfamily_ids):
-                for self.gp in [mfamilies[0].get_father_id (),
+                for self.gp in [self.database.find_family_from_id(mfamily_ids[0]).get_father_id (),
-                                mfamilies[0].get_mother_id ()]:
+                                self.database.find_family_from_id(mfamilies[0]).get_mother_id ()]:
                     if self.gp:
                         break
 
@@ -240,15 +240,15 @@ class ComprehensiveAncestorsReport (Report.Report):
                 people.append ((self.doc.write_text, [heading]))
                 people.append ((self.doc.end_paragraph, []))
 
-            for family in mfamilies:
+            for family_id in mfamily_ids:
-                people.extend (self.family (family, already_described))
+                people.extend (self.family (family_id, already_described))
 
             if len (people):
                 if self.pgbrk:
                     self.doc.page_break()
                 self.doc.start_paragraph ("AR-Heading")
-                family_ids = pfamilies
+                family_ids = pfamily_ids
-                family_ids.extend (mfamilies)
+                family_ids.extend (mfamily_ids)
                 for self.gp in [self.database.find_family_from_id(family_ids[0]).get_father_id (),
                                 self.database.find_family_from_id(family_ids[0]).get_mother_id ()]:
                     if self.gp:
@@ -269,8 +269,8 @@ class ComprehensiveAncestorsReport (Report.Report):
                 self.doc.end_paragraph ()
                 self.write_paragraphs (people)
 
-                next_pfamilies = []
+                next_pfamily_ids = []
-                next_mfamilies = []
+                next_mfamily_ids = []
                 for family_id in family_ids:
                     family = self.database.find_family_from_id(family_id)
                     father_id = family.get_father_id ()
@@ -280,7 +280,7 @@ class ComprehensiveAncestorsReport (Report.Report):
                         father_family_id = father.get_main_parents_family_id ()
                         father_family = self.database.find_family_from_id(father_family_id)
                         if father_family:
-                            next_pfamilies.append (father_family)
+                            next_pfamily_ids.append (father_family_id)
 
                     mother_id = family.get_mother_id ()
                     mother = self.database.find_person_from_id(mother_id)
@@ -289,10 +289,10 @@ class ComprehensiveAncestorsReport (Report.Report):
                         mother_family_id = mother.get_main_parents_family_id ()
                         mother_family = self.database.find_family_from_id(mother_family_id)
                         if mother_family:
-                            next_mfamilies.append (mother_family)
+                            next_mfamily_ids.append (mother_family_id)
 
-                self.generation (generations - 1, next_pfamilies,
+                self.generation (generations - 1, next_pfamily_ids,
-                                 next_mfamilies, already_described,
+                                 next_mfamily_ids, already_described,
                                  thisgen + 1)
 
     def person (self, person_id,

src/plugins/rel_ru.py

@@ -41,6 +41,10 @@ from gettext import gettext as _
 #
 #-------------------------------------------------------------------------
 
+_parents_level = [ "", "родители", 
+"дедушки/бабушки", "прадедушки/прабабушки", "прапрадедушки/прапрабабушки",
+]
+
 _male_cousin_level = [ 
   "", "двоюродный", "троюродный", "четвероюродный",
   "пятиюродный", "шестиюродный", "семиюродный", "восьмиюродный",
@@ -112,6 +116,12 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
     def __init__(self,db):
         Relationship.RelationshipCalculator.__init__(self,db)
 
+    def get_parents(self,level):
+        if level>len(_parents_level)-1:
+            return _("remote ancestors")
+        else:
+            return _parents_level[level]
+
     def get_junior_male_cousin(self,level,removed):
         if removed > len(_junior_male_removed_level)-1 or level>len(_male_cousin_level)-1:
             return "дальний родственник"
@@ -279,6 +289,56 @@ class RelationshipCalculator(Relationship.RelationshipCalculator):
                 return (self.get_junior_female_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,
+        along with a list of common ancestors (typically father,mother) 
+        """
+        firstMap = {}
+        firstList = []
+        secondMap = {}
+        secondList = []
+        common = []
+        rank = 9999999
+        
+        if orig_person == None:
+            return ("undefined",[])
+
+        if orig_person == other_person:
+            return ('', [])
+        
+        try:
+            self.apply_filter(orig_person,0,firstList,firstMap)
+            self.apply_filter(other_person,0,secondList,secondMap)
+        except RuntimeError,msg:
+            return (_("Relationship loop detected"),None)
+    
+        for person_id in firstList:
+            if person_id in secondList:
+                new_rank = firstMap[person_id]
+                if new_rank < rank:
+                    rank = new_rank
+                    common = [ person_id ]
+                elif new_rank == rank:
+                    common.append(person_id)
+
+        firstRel = -1
+        secondRel = -1
+
+        if common:
+            person_id = common[0]
+            secondRel = firstMap[person_id]
+            firstRel = secondMap[person_id]
+            
+        if firstRel == 0:
+            if secondRel == 0:
+                return ('',common)
+            else:
+                return (self.get_parents(secondRel),common)
+        else:
+            return None
+
+
 #-------------------------------------------------------------------------
 #
 # Register this class with the Plugins system