diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index 3bab4bfb2..9a11f811d 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,7 @@ +2005-08-31 Don Allingham + * src/ReadGedcom.py: handle attributes if value is on the same line as the + keyword + 2005-08-31 Martin Hawlisch * src/ReportUtils.py (insert_images): Warn about non existing files diff --git a/gramps2/example/gedcom/sample.ged b/gramps2/example/gedcom/sample.ged index 02076f73c..602d7dc2d 100755 --- a/gramps2/example/gedcom/sample.ged +++ b/gramps2/example/gedcom/sample.ged @@ -70,6 +70,12 @@ 1 EDUC 2 DATE BET. 1979 - 1984 2 PLAC UC Berkeley +1 SSN 123-456-7890 +1 CAST cast keyword +1 DSCR dscr keyword +1 IDNO idno keyword +1 NATI nati keyword +1 NCHI nchi keyword 1 _DEG 2 DATE 1984 2 PLAC B.S.E.E. diff --git a/gramps2/src/ReadGedcom.py b/gramps2/src/ReadGedcom.py index 1ad720f49..c9e4d38a8 100644 --- a/gramps2/src/ReadGedcom.py +++ b/gramps2/src/ReadGedcom.py @@ -1133,7 +1133,7 @@ class GedcomParser: elif self.gedattr.has_key(n): attr = RelLib.Attribute() attr.set_type(self.gedattr[n]) - attr.set_value(event.get_description()) + attr.set_value(event.get_description() + matches[2]) self.person.add_attribute(attr) self.parse_person_attr(attr,2) continue