From 62a25d797d40c13c5dc086aeed945d471b100b9d Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Sun, 29 Feb 2004 05:09:23 +0000 Subject: [PATCH] * src/ChooseParents.py: fix typo * src/PedView.py: build child menu with IDs * src/ReadGedcom.py: save birth/death events, handle FTM's broken "_primary" junk svn: r2936 --- ChangeLog | 4 ++++ src/ChooseParents.py | 2 +- src/RelLib.py | 4 +++- src/plugins/ReadGedcom.py | 8 +++++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fe9a44c2..69f3c93ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,10 @@ * src/Marriage.py: Corrections. 2004-02-28 Don Allingham + * src/ChooseParents.py: fix typo + * src/PedView.py: build child menu with IDs + * src/ReadGedcom.py: save birth/death events, handle FTM's broken + "_primary" junk * src/gramps_main.py: switch to DB as default, remove save option * src/RelLib.py: setup DB environment better * src/DbPrompter.py: handle save/open with new DBs diff --git a/src/ChooseParents.py b/src/ChooseParents.py index 543814d18..b5004d7f1 100644 --- a/src/ChooseParents.py +++ b/src/ChooseParents.py @@ -646,7 +646,7 @@ class ModifyParents: if len(self.person.get_parent_family_id_list()) > 1: self.glade.get_widget('pref_label').show() self.pref.show() - if family == self.person.get_parent_family_id_list()[0]: + if self.family == self.person.get_parent_family_id_list()[0]: self.pref.set_active(1) else: self.pref.set_active(0) diff --git a/src/RelLib.py b/src/RelLib.py index f893a9f88..e897dc382 100644 --- a/src/RelLib.py +++ b/src/RelLib.py @@ -2356,7 +2356,9 @@ class GrampsDB: def sort_person_keys(self): if self.person_map: - return self.person_map.keys() + keys = self.person_map.keys() + keys.sort(self.sort_by_name) + return keys else: return [] # keys = self.person_map.keys() diff --git a/src/plugins/ReadGedcom.py b/src/plugins/ReadGedcom.py index 77ef3e300..88eeec07c 100644 --- a/src/plugins/ReadGedcom.py +++ b/src/plugins/ReadGedcom.py @@ -811,6 +811,7 @@ class GedcomParser: self.person.add_address(addr) elif matches[1] == "BIRT": event = RelLib.Event() + self.db.add_event(event) if self.person.get_birth_id(): event.set_name("Alternate Birth") self.person.add_event_id(event.get_id()) @@ -818,7 +819,7 @@ class GedcomParser: event.set_name("Birth") self.person.set_birth_id(event.get_id()) self.parse_person_event(event,2) - self.db.add_event(event) + self.db.commit_event(event) elif matches[1] == "ADOP": event = RelLib.Event() event.set_name("Adopted") @@ -827,6 +828,7 @@ class GedcomParser: self.db.add_event(event) elif matches[1] == "DEAT": event = RelLib.Event() + self.db.add_event(event) if self.person.get_death_id(): event.set_name("Alternate Death") self.person.add_event_id(event.get_id()) @@ -834,7 +836,7 @@ class GedcomParser: event.set_name("Death") self.person.set_death_id(event.get_id()) self.parse_person_event(event,2) - self.db.add_event(event) + self.db.commit_event(event) elif matches[1] == "EVEN": event = RelLib.Event() if matches[2]: @@ -919,7 +921,7 @@ class GedcomParser: source_ref = self.handle_source(matches,level+1) self.person.get_primary_name().add_source_reference(source_ref) elif matches[1] == "_PRIMARY": - type = matches[1] + pass #type = matches[1] elif matches[1] == "NOTE": if not string.strip(matches[2]) or matches[2] and matches[2][0] != "@": note = matches[2] + self.parse_continue_data(level+1)