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

* src/ReadGedcom.py (parse_record, parse_individual, parse_ord,

Browse Source 
parse_adopt_event): Don't include "@" signs into family gramps id.
* src/PedView.py (find_tree): Correctly retrieve parents.


svn: r3465
This commit is contained in:
Alex Roitman 2004-08-21 20:43:34 +00:00
parent 5222330f5c
commit 076fa45195
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -30,6 +30,9 @@
* src/plugins/Verify.py (on_apply_clicked): Use gramps id for * src/plugins/Verify.py (on_apply_clicked): Use gramps id for
display; (get_year): Corrections. display; (get_year): Corrections.
* src/ReadGedcom.py (parse_record, parse_individual, parse_ord,
parse_adopt_event): Don't include "@" signs into family gramps id.
* src/PedView.py (find_tree): Correctly retrieve parents.
2004-08-20 Don Allingham <dallingham@users.sourceforge.net> 2004-08-20 Don Allingham <dallingham@users.sourceforge.net>
* src/gramps_main.py: update family display after EditPerson * src/gramps_main.py: update family display after EditPerson

6
src/PedView.py
View File

@ -485,7 +485,11 @@ class PedigreeView:
if depth > 5 or person == None: if depth > 5 or person == None:
return return
(family_handle,m,f) = person.get_main_parents_family_handle() parent_families = person.get_parent_family_handle_list()
if parent_families:
(family_handle,m,f) = parent_families[0]
else:
return
if family_handle: if family_handle:
mrel = (m != "Birth") mrel = (m != "Birth")
frel = (f != "Birth") frel = (f != "Birth")

10
src/ReadGedcom.py
View File

@ -498,7 +498,7 @@ class GedcomParser:
if self.fam_count % UPDATE == 0 and self.window: if self.fam_count % UPDATE == 0 and self.window:
self.update(self.families_obj,str(self.fam_count)) self.update(self.families_obj,str(self.fam_count))
self.fam_count = self.fam_count + 1 self.fam_count = self.fam_count + 1
self.family = self.find_or_create_family(matches[1]) self.family = self.find_or_create_family(matches[1][1:-1])
self.parse_family() self.parse_family()
if self.addr != None: if self.addr != None:
father_handle = self.family.get_father_handle() father_handle = self.family.get_father_handle()
@ -840,7 +840,7 @@ class GedcomParser:
self.person.set_lds_sealing(ord) self.person.set_lds_sealing(ord)
self.parse_ord(ord,2) self.parse_ord(ord,2)
elif matches[1] == "FAMS": elif matches[1] == "FAMS":
family = self.find_or_create_family(matches[2]) family = self.find_or_create_family(matches[2][1:-1])
self.person.add_family_handle(family.get_handle()) self.person.add_family_handle(family.get_handle())
if note == "": if note == "":
note = self.parse_optional_note(2) note = self.parse_optional_note(2)
@ -849,7 +849,7 @@ class GedcomParser:
self.db.commit_family(family, self.trans) self.db.commit_family(family, self.trans)
elif matches[1] == "FAMC": elif matches[1] == "FAMC":
type,note = self.parse_famc_type(2) type,note = self.parse_famc_type(2)
family = self.find_or_create_family(matches[2]) family = self.find_or_create_family(matches[2][1:-1])
for f in self.person.get_parent_family_handle_list(): for f in self.person.get_parent_family_handle_list():
if f[0] == family.get_handle(): if f[0] == family.get_handle():
@ -1162,7 +1162,7 @@ class GedcomParser:
elif matches[1] == "DATE": elif matches[1] == "DATE":
ord.set_date_object(self.extract_date(matches[2])) ord.set_date_object(self.extract_date(matches[2]))
elif matches[1] == "FAMC": elif matches[1] == "FAMC":
ord.set_family_handle(self.find_or_create_family(matches[2])) ord.set_family_handle(self.find_or_create_family(matches[2][1:-1]))
elif matches[1] == "PLAC": elif matches[1] == "PLAC":
try: try:
val = matches[2] val = matches[2]
@ -1258,7 +1258,7 @@ class GedcomParser:
elif matches[1] == "SOUR": elif matches[1] == "SOUR":
event.add_source_reference(self.handle_source(matches,level+1)) event.add_source_reference(self.handle_source(matches,level+1))
elif matches[1] == "FAMC": elif matches[1] == "FAMC":
family = self.find_or_create_family(matches[2]) family = self.find_or_create_family(matches[2][1:-1])
mrel,frel = self.parse_adopt_famc(level+1); mrel,frel = self.parse_adopt_famc(level+1);
if self.person.get_main_parents_family_handle() == family.get_handle(): if self.person.get_main_parents_family_handle() == family.get_handle():
self.person.set_main_parent_family_handle(None) self.person.set_main_parent_family_handle(None)