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

Fix GEDCOM import of CHAN for SOUR, REPO, OBJE. Bug 3373.

Browse Source 
svn: r14513
This commit is contained in:
Gary Burton 2010-02-28 12:28:49 +00:00
parent 5314acd4fa
commit 24bf1c6434
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/lib/libgedcom.py
View File

@ -2,7 +2,7 @@
# Gramps - a GTK+/GNOME based genealogy program # Gramps - a GTK+/GNOME based genealogy program
# #
# Copyright (C) 2000-2007 Donald N. Allingham # Copyright (C) 2000-2007 Donald N. Allingham
# Copyright (C) 2009 Gary Burton # Copyright (C) 2009-2010 Gary Burton
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -1814,6 +1814,7 @@ class GedcomParser(UpdateCallback):
TOKEN_RIN : self.__ignore, TOKEN_RIN : self.__ignore,
TOKEN_NOTE : self.__repo_note, TOKEN_NOTE : self.__repo_note,
TOKEN_RNOTE : self.__repo_note, TOKEN_RNOTE : self.__repo_note,
TOKEN_CHAN : self.__repo_chan,
} }
self.event_parse_tbl = { self.event_parse_tbl = {
@ -2640,11 +2641,7 @@ class GedcomParser(UpdateCallback):
self.__add_default_source(person) self.__add_default_source(person)
# commit the person to the database # commit the person to the database
if person.change: self.dbase.commit_person(person, self.trans, state.person.change)
self.dbase.commit_person(person, self.trans,
change_time=state.person.change)
else:
self.dbase.commit_person(person, self.trans)
def __person_sour(self, line, state): def __person_sour(self, line, state):
""" """
@ -3682,11 +3679,7 @@ class GedcomParser(UpdateCallback):
self.__add_default_source(family) self.__add_default_source(family)
# commit family to database # commit family to database
if family.change: self.dbase.commit_family(family, self.trans, family.change)
self.dbase.commit_family(family, self.trans,
change_time=family.change)
else:
self.dbase.commit_family(family, self.trans)
def __family_husb(self, line, state): def __family_husb(self, line, state):
""" """
@ -4795,7 +4788,7 @@ class GedcomParser(UpdateCallback):
state.level = level state.level = level
self.__parse_level(state, self.source_func, self.__undefined) self.__parse_level(state, self.source_func, self.__undefined)
self.dbase.commit_source(state.source, self.trans) self.dbase.commit_source(state.source, self.trans, state.source.change)
def __source_attr(self, line, state): def __source_attr(self, line, state):
""" """
@ -4889,6 +4882,15 @@ class GedcomParser(UpdateCallback):
""" """
self.__parse_note(line, state.repo_ref, state.level+1) self.__parse_note(line, state.repo_ref, state.level+1)
def __repo_chan(self, line, state):
"""
@param line: The current line in GedLine format
@type line: GedLine
@param state: The current state
@type state: CurrentState
"""
self.__parse_change(line, state.repo, state.level+1)
def __source_abbr(self, line, state): def __source_abbr(self, line, state):
""" """
@param line: The current line in GedLine format @param line: The current line in GedLine format
@ -4984,11 +4986,7 @@ class GedcomParser(UpdateCallback):
self.__add_default_source(media) self.__add_default_source(media)
# commit the person to the database # commit the person to the database
if media.change: self.dbase.commit_media_object(media, self.trans, media.change)
self.dbase.commit_media_object(media, self.trans,
change_time=media.change)
else:
self.dbase.commit_media_object(media, self.trans)
def __obje_form(self, line, state): def __obje_form(self, line, state):
""" """
@ -5079,7 +5077,7 @@ class GedcomParser(UpdateCallback):
@param state: The current state @param state: The current state
@type state: CurrentState @type state: CurrentState
""" """
self.__skip_subordinate_levels(state.level+1) self.__parse_change(line, state.media, state.level+1)
def __person_attr_type(self, line, state): def __person_attr_type(self, line, state):
""" """
@ -5152,7 +5150,7 @@ class GedcomParser(UpdateCallback):
state.level = 1 state.level = 1
self.__parse_level(state, self.repo_parse_tbl, self.__ignore) self.__parse_level(state, self.repo_parse_tbl, self.__ignore)
self.dbase.commit_repository(repo, self.trans) self.dbase.commit_repository(repo, self.trans, repo.change)
def __repo_name(self, line, state): def __repo_name(self, line, state):
""" """