2007-02-27 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_GedcomParse.py (GedcomParser.parse_fam): use parse_level svn: r8255
This commit is contained in:
parent
d7d7ed340b
commit
0a75738eb5
@ -1,3 +1,7 @@
|
||||
2007-02-27 Don Allingham <don@gramps-project.org>
|
||||
* src/GrampsDbUtils/_GedcomParse.py (GedcomParser.parse_fam): use
|
||||
parse_level
|
||||
|
||||
2007-02-26 Brian Matherly <brian@gramps-project.org>
|
||||
* src/BaseDoc.py:
|
||||
* src/docgen/PSDrawDoc.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:
|
||||
|
Loading…
Reference in New Issue
Block a user