From 0a75738eb5cffe37ade40c5693b0c5aeeb0fa49f Mon Sep 17 00:00:00 2001 From: Don Allingham Date: Tue, 27 Feb 2007 16:45:40 +0000 Subject: [PATCH] 2007-02-27 Don Allingham * src/GrampsDbUtils/_GedcomParse.py (GedcomParser.parse_fam): use parse_level svn: r8255 --- ChangeLog | 4 ++++ src/GrampsDbUtils/_GedcomParse.py | 13 ++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3726677e0..3de07d533 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2007-02-27 Don Allingham + * src/GrampsDbUtils/_GedcomParse.py (GedcomParser.parse_fam): use + parse_level + 2007-02-26 Brian Matherly * src/BaseDoc.py: * src/docgen/PSDrawDoc.py: diff --git a/src/GrampsDbUtils/_GedcomParse.py b/src/GrampsDbUtils/_GedcomParse.py index 09bee5bf0..e6f978636 100644 --- a/src/GrampsDbUtils/_GedcomParse.py +++ b/src/GrampsDbUtils/_GedcomParse.py @@ -1034,7 +1034,6 @@ class GedcomParser(UpdateCallback): msg = _("Line %d was not understood, so it was ignored.") % text self.warn(msg) self.error_count += 1 - sys.exit(1) self.skip_subordinate_levels(level) def warn(self, msg): @@ -2353,18 +2352,10 @@ class GedcomParser(UpdateCallback): # parse the family - state = GedcomUtils.CurrentState() - state.level = 1 + state = GedcomUtils.CurrentState(level=1) state.family = family - while True: - line = self.get_next() - - if self.level_is_finished(line, 1): - break - if line.token not in (TOKEN_ENDL, TOKEN_BAPL, TOKEN_CONL): - func = self.family_func.get(line.token, self.func_family_even) - func(line, state) + self.parse_level(state, self.family_func, self.func_family_even) # handle addresses attached to families if state.addr != None: