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

0005606: GEDCOM import: NOTE_RECORD is not handled properly

Browse Source 
svn: r18994
This commit is contained in:
Tim G L Lyons 2012-03-02 18:27:10 +00:00
parent d4e0017365
commit 0427db85d6
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1689,6 +1689,9 @@ class IdMapper(object):
temp = temp[1:-1] temp = temp[1:-1]
temp = self.id2user_format(temp) temp = self.id2user_format(temp)
return temp return temp
def map(self):
return self.swap
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -6539,9 +6542,7 @@ class GedcomParser(UpdateCallback):
#NOTE_STRUCTURE: = #NOTE_STRUCTURE: =
# n NOTE @<XREF:NOTE>@ {1:1} # n NOTE @<XREF:NOTE>@ {1:1}
# +1 SOUR @<XREF:SOUR>@ {0:M} # +1 SOUR @<XREF:SOUR>@ {0:M}
gid = line.data.strip() obj.add_note(self.__find_note_handle(self.nid_map[line.data]))
gramps_id = self.nid_map[gid]
obj.add_note(self.__find_note_handle(gramps_id))
else: else:
# Embedded note # Embedded note
#NOTE_STRUCTURE: = #NOTE_STRUCTURE: =
@ -6584,12 +6585,13 @@ class GedcomParser(UpdateCallback):
+1 <<CHANGE_DATE>> {0:1} +1 <<CHANGE_DATE>> {0:1}
""" """
state = CurrentState(level=1) state = CurrentState(level=1)
gid = self.nid_map[line.token_text] if not line.data and \
handle = self.nid2id.get(gid) self.nid_map.clean(line.token_text) not in self.nid_map.map():
if not line.data and handle is None: self.__add_msg(_("Empty note ignored"), line)
self.__add_msg(_("Empty note ignored"), line, state)
self.__skip_subordinate_levels(level, state) self.__skip_subordinate_levels(level, state)
else: else:
gid = self.nid_map[line.token_text]
handle = self.__find_note_handle(gid)
new_note = gen.lib.Note(line.data) new_note = gen.lib.Note(line.data)
new_note.set_handle(handle) new_note.set_handle(handle)
new_note.set_gramps_id(gid) new_note.set_gramps_id(gid)
@ -6600,9 +6602,8 @@ class GedcomParser(UpdateCallback):
state.msg += sub_state.msg state.msg += sub_state.msg
self.dbase.commit_note(new_note, self.trans, new_note.change) self.dbase.commit_note(new_note, self.trans, new_note.change)
self.nid2id[new_note.gramps_id] = new_note.handle self.__check_msgs(_("NOTE Gramps ID %s") % new_note.get_gramps_id(),
self.__check_msgs(_("NOTE Gramps ID %s") % new_note.get_gramps_id(), state, None)
state, None)
def __note_chan(self, line, state): def __note_chan(self, line, state):
if state.note: if state.note: