From b715342889e6c1f1a9542db001820f43baea8460 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 25 Jul 2005 21:00:39 +0000 Subject: [PATCH] GEDCOM gender fix for PAF svn: r4966 --- gramps2/ChangeLog | 6 ++++++ gramps2/src/MediaView.py | 4 +++- gramps2/src/ReadGedcom.py | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 4a00db03c..b340fe1cc 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,9 @@ +2005-07-24 Don Allingham + * src/MediaView.py: don't indicate missing path for Notes, which + aren't supposed to have a path + * src/ReadGedcom.py: Handle PAF's non-GEDCOM compliant method of + indicating unknown gender. + 2005-07-24 Alex Roitman * src/plugins/RelCalc.py (__init__): Correctly name column header. diff --git a/gramps2/src/MediaView.py b/gramps2/src/MediaView.py index 83fd10732..2bceaf49e 100644 --- a/gramps2/src/MediaView.py +++ b/gramps2/src/MediaView.py @@ -248,7 +248,9 @@ class MediaView: self.mid.set_text(mobj.get_gramps_id()) self.mtype.set_text(type_name) self.mdesc.set_text(mobj.get_description()) - if len(path) == 0 or fexists == 0: + if type_name == _('Note'): + self.mpath.set_text('') + elif len(path) == 0 or fexists == 0: self.mpath.set_text(_("The file no longer exists")) else: self.mpath.set_text(path) diff --git a/gramps2/src/ReadGedcom.py b/gramps2/src/ReadGedcom.py index efad239e5..882a29cac 100644 --- a/gramps2/src/ReadGedcom.py +++ b/gramps2/src/ReadGedcom.py @@ -1004,8 +1004,10 @@ class GedcomParser: self.person.set_gender(RelLib.Person.UNKNOWN) elif matches[2][0] == "M": self.person.set_gender(RelLib.Person.MALE) - else: + elif matches[2][0] == "F": self.person.set_gender(RelLib.Person.FEMALE) + else: + self.person.set_gender(RelLib.Person.UNKNOWN) elif matches[1] in [ "BAPL", "ENDL", "SLGC" ]: lds_ord = RelLib.LdsOrd() if matches[1] == "BAPL":