Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-02-26 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDbUtils/_GedcomParse.py: handle EVENTS with argument on
	the declaration line
	* src/GrampsDbUtils/_GedcomLex.py: handle EVENTS with argument on
	the declaration line



svn: r8251
This commit is contained in:
Don Allingham 2007-02-26 23:12:29 +00:00
parent 66ea62668c
commit 19f4c3ab91
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-02-26 Don Allingham <don@gramps-project.org>
* src/GrampsDbUtils/_GedcomParse.py: handle EVENTS with argument on
the declaration line
* src/GrampsDbUtils/_GedcomLex.py: handle EVENTS with argument on
the declaration line
2007-02-26 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2007-02-26 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/RelLib/_AttributeType.py: Add WITNESS (used by GEDCOM parser to * src/RelLib/_AttributeType.py: Add WITNESS (used by GEDCOM parser to
import textual event witness information import textual event witness information

5
src/GrampsDbUtils/_GedcomLex.py
View File

@ -179,8 +179,11 @@ class GedLine:
""" """
token = GED2GRAMPS.get(self.token_text) token = GED2GRAMPS.get(self.token_text)
if token: if token:
event = RelLib.Event()
event.set_description(self.data)
event.set_type(token)
self.token = TOKEN_GEVENT self.token = TOKEN_GEVENT
self.data = token self.data = event
else: else:
token = GED2ATTR.get(self.token_text) token = GED2ATTR.get(self.token_text)
if token: if token:

11
src/GrampsDbUtils/_GedcomParse.py
View File

@ -1460,10 +1460,10 @@ class GedcomParser(UpdateCallback):
@param state: The current state @param state: The current state
@type state: CurrentState @type state: CurrentState
""" """
event = RelLib.Event()
event = line.data
event.set_gramps_id(self.emapper.find_next())
event_ref = RelLib.EventRef() event_ref = RelLib.EventRef()
event.set_gramps_id(self.emapper.find_next())
event.set_type(line.data)
self.dbase.add_event(event, self.trans) self.dbase.add_event(event, self.trans)
sub_state = GedcomUtils.CurrentState() sub_state = GedcomUtils.CurrentState()
@ -2436,11 +2436,10 @@ class GedcomParser(UpdateCallback):
@param state: The current state @param state: The current state
@type state: CurrentState @type state: CurrentState
""" """
event = RelLib.Event() event = line.data
event.set_gramps_id(self.emapper.find_next())
event_ref = RelLib.EventRef() event_ref = RelLib.EventRef()
event_ref.set_role(RelLib.EventRoleType.FAMILY) event_ref.set_role(RelLib.EventRoleType.FAMILY)
event.set_gramps_id(self.emapper.find_next())
event.set_type(line.data)
self.dbase.add_event(event, self.trans) self.dbase.add_event(event, self.trans)
sub_state = GedcomUtils.CurrentState() sub_state = GedcomUtils.CurrentState()