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

2006-06-07 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadGedcom.py: fix child/parent relationships



svn: r6872
This commit is contained in:
Don Allingham 2006-06-08 04:08:16 +00:00
parent b84541e824
commit baeafc820a
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2006-06-07 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: fix child/parent relationships
2006-06-06 Don Allingham <don@gramps-project.org> 2006-06-06 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: read gedcoms that we write * src/GrampsDb/_ReadGedcom.py: read gedcoms that we write
* src/GrampsDb/_WriteGedcom.py: read gedcoms that we write * src/GrampsDb/_WriteGedcom.py: read gedcoms that we write

50
src/GrampsDb/_ReadGedcom.py
View File

@ -730,7 +730,7 @@ class GedcomParser(UpdateCallback):
m = snameRegexp.match(text) m = snameRegexp.match(text)
if m: if m:
names = m.groups() names = m.groups()
name.set_first_name(names[2].strip()) name.set_first_name(names[1].strip())
name.set_surname(names[0].strip()) name.set_surname(names[0].strip())
else: else:
try: try:
@ -1206,11 +1206,20 @@ class GedcomParser(UpdateCallback):
gid = matches[2] gid = matches[2]
child = self.find_or_create_person(self.map_gid(gid[1:-1])) child = self.find_or_create_person(self.map_gid(gid[1:-1]))
ref = RelLib.ChildRef() reflist = [ ref for ref in self.family.get_child_ref_list() \
ref.ref = child.handle if ref.ref == child.handle ]
ref.set_father_relation(frel) if reflist:
ref.set_mother_relation(mrel) ref = reflist[0]
self.family.add_child_ref(ref) if mrel != RelLib.ChildRefType.BIRTH or \
frel != RelLib.ChildRefType.BIRTH:
ref.set_father_relation(frel)
ref.set_mother_relation(mrel)
else:
ref = RelLib.ChildRef()
ref.ref = child.handle
ref.set_father_relation(frel)
ref.set_mother_relation(mrel)
family.add_child_ref(ref)
def func_family_nchil(self, family, matches, level): def func_family_nchil(self, family, matches, level):
a = RelLib.Attribute() a = RelLib.Attribute()
@ -1623,7 +1632,7 @@ class GedcomParser(UpdateCallback):
else: else:
func = self.person_attr.get(matches[1], func = self.person_attr.get(matches[1],
self.func_person_attr_undef) self.func_person_attr_undef)
func(matches, event, level+1) func(attr, matches, level+1)
def func_person_attr_undef(self, attr, matches, level): def func_person_attr_undef(self, attr, matches, level):
""" """
@ -1659,7 +1668,7 @@ class GedcomParser(UpdateCallback):
self.ignore_sub_junk(level) self.ignore_sub_junk(level)
def func_person_attr_note(self, attr, matches, level): def func_person_attr_note(self, attr, matches, level):
info = self.parse_note(matches,attr,level+1,'') info = self.parse_note(matches, attr, level+1, '')
attr.set_note(info) attr.set_note(info)
def parse_source_reference(self,source,level): def parse_source_reference(self,source,level):
@ -2225,7 +2234,8 @@ class GedcomParser(UpdateCallback):
def func_person_famc(self,matches,state): def func_person_famc(self,matches,state):
ftype,famc_note = self.parse_famc_type(2,state.person) ftype,famc_note = self.parse_famc_type(2,state.person)
handle = self.find_family_handle(matches[2][1:-1]) gid = matches[2][1:-1]
handle = self.find_family_handle(gid)
for f in self.person.get_parent_family_handle_list(): for f in self.person.get_parent_family_handle_list():
if f[0] == handle: if f[0] == handle:
@ -2237,7 +2247,27 @@ class GedcomParser(UpdateCallback):
if state.person.get_main_parents_family_handle() == handle: if state.person.get_main_parents_family_handle() == handle:
state.person.set_main_parent_family_handle(None) state.person.set_main_parent_family_handle(None)
state.person.add_parent_family_handle(handle) state.person.add_parent_family_handle(handle)
print "NEED TO CHANGE CHILDREF TO",ftype,ftype
# search childrefs
family = self.db.find_family_from_handle(handle, self.trans)
family.set_gramps_id(gid)
for ref in family.get_child_ref_list():
if ref.ref == state.person.handle:
ref.set_mother_relation(ftype)
ref.set_father_relation(ftype)
break
else:
ref = RelLib.ChildRef()
ref.ref = state.person.handle
ref.set_mother_relation(ftype)
ref.set_father_relation(ftype)
family.add_child_ref(ref)
self.db.commit_family(family, self.trans)
print "---------------"
print "p",state.person.handle, "f",family.handle
print state.person.parent_family_list
print [ ref.ref for ref in family.get_child_ref_list() ]
def func_person_resi(self,matches,state): def func_person_resi(self,matches,state):
""" """