From 5f2ed45b6db2fe368a9afa9771255e342e0ef8e6 Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Mon, 21 Aug 2006 03:39:13 +0000 Subject: [PATCH] 2006-08-20 Don Allingham * src/GrampsDb/_ReadGedcom.py: fix CHAN parsing for family svn: r7220 --- gramps2/ChangeLog | 3 +++ gramps2/src/GrampsDb/_ReadGedcom.py | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index c2790ee5f..57a788d86 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2006-08-20 Don Allingham + * src/GrampsDb/_ReadGedcom.py: fix CHAN parsing for family + 2006-08-20 Brian Matherly * src/plugins/EventCmp.py: improve Date/Place display (#0000226) diff --git a/gramps2/src/GrampsDb/_ReadGedcom.py b/gramps2/src/GrampsDb/_ReadGedcom.py index 30ca992e6..30fad54f5 100644 --- a/gramps2/src/GrampsDb/_ReadGedcom.py +++ b/gramps2/src/GrampsDb/_ReadGedcom.py @@ -659,7 +659,7 @@ class GedcomParser(UpdateCallback): TOKEN_RIN : self.func_family_ignore, TOKEN_SUBM : self.func_family_ignore, TOKEN_REFN : self.func_family_ignore, - TOKEN_CHAN : self.func_family_ignore, + TOKEN_CHAN : self.func_family_chan, TOKEN_OBJE : self.func_family_object, TOKEN__COMM : self.func_family_comm, TOKEN_NOTE : self.func_family_note, @@ -2479,7 +2479,7 @@ class GedcomParser(UpdateCallback): self.parse_change(matches, state.person, state.level+1) def func_family_chan(self, family, matches, level): - self.parse_change(matches, family, level+1) + self.parse_change(matches, family, level) def func_source_chan(self, matches, source, level): self.parse_change(matches, source, level+1) @@ -2506,7 +2506,6 @@ class GedcomParser(UpdateCallback): while True: matches = self.get_next() - if self.level_is_finished(matches, level): break elif matches[1] == TOKEN_TIME: