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

#4044 #2855 #2762 fix on half relations (contribution by reinhard)

Browse Source 
svn: r15529
This commit is contained in:
Jérôme Rapinat 2010-06-05 06:25:46 +00:00
parent a36690aa26
commit bc9cdd3896
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Relationship.py
View File

@ -1330,6 +1330,7 @@ class RelationshipCalculator(object):
all_dist=True, all_dist=True,
all_families=True, only_birth=False) all_families=True, only_birth=False)
if not data[0][0] == -1: if not data[0][0] == -1:
data = self.collapse_relations(data)
for rel in data : for rel in data :
rel2 = rel[2] rel2 = rel[2]
rel4 = rel[4] rel4 = rel[4]
@ -1360,13 +1361,13 @@ class RelationshipCalculator(object):
if not rel_str in relstrings: if not rel_str in relstrings:
relstrings.append(rel_str) relstrings.append(rel_str)
if rel1: if rel1:
commons[rel_str] = [rel1] commons[rel_str] = rel1
else: else:
#unknown parent eg #unknown parent eg
commons[rel_str] = [] commons[rel_str] = []
else: else:
if rel1: if rel1:
commons[rel_str].append(rel1) commons[rel_str].extend(rel1)
#construct the return tupply, relstrings is ordered on rank automatic #construct the return tupply, relstrings is ordered on rank automatic
common_list = [] common_list = []
for rel_str in relstrings: for rel_str in relstrings: