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

4187: Error on GEDCOM file import

Browse Source 
svn: r15791
This commit is contained in:
Doug Blank 2010-08-22 01:50:58 +00:00
parent fc3ed649f1
commit e39dedb453
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5487,7 +5487,10 @@ class GedcomParser(UpdateCallback):
if line.token == TOKEN_RNOTE: if line.token == TOKEN_RNOTE:
# reference to a named note defined elsewhere # reference to a named note defined elsewhere
gid = line.data.strip() gid = line.data.strip()
if obj:
obj.add_note(self.__find_note_handle(self.nid_map[gid])) obj.add_note(self.__find_note_handle(self.nid_map[gid]))
else:
LOG.debug('Error: obj is None')
else: else:
if not line.data: if not line.data:
msg = _("Line %d: empty note was ignored.") % line.line msg = _("Line %d: empty note was ignored.") % line.line
@ -5498,7 +5501,10 @@ class GedcomParser(UpdateCallback):
new_note.set_handle(Utils.create_id()) new_note.set_handle(Utils.create_id())
self.dbase.add_note(new_note, self.trans) self.dbase.add_note(new_note, self.trans)
self.__skip_subordinate_levels(level+1) self.__skip_subordinate_levels(level+1)
if obj:
obj.add_note(new_note.get_handle()) obj.add_note(new_note.get_handle())
else:
LOG.debug('Error: obj is None')
def __parse_inline_note(self, line, level): def __parse_inline_note(self, line, level):
if not line.data: if not line.data:
@ -5628,7 +5634,10 @@ class GedcomParser(UpdateCallback):
url.set_path(filename) url.set_path(filename)
url.set_description(title) url.set_description(title)
url.set_type(gen.lib.UrlType.WEB_HOME) url.set_type(gen.lib.UrlType.WEB_HOME)
if obj:
obj.add_url(url) obj.add_url(url)
else:
LOG.debug('Error: obj is None')
else: else:
(valid, path) = self.__find_file(filename, self.dir_path) (valid, path) = self.__find_file(filename, self.dir_path)
if not valid: if not valid:
@ -5652,7 +5661,10 @@ class GedcomParser(UpdateCallback):
oref.set_reference_handle(photo.handle) oref.set_reference_handle(photo.handle)
if note: if note:
oref.add_note(self.__find_note_handle(self.nid_map[note])) oref.add_note(self.__find_note_handle(self.nid_map[note]))
if obj:
obj.add_media_reference(oref) obj.add_media_reference(oref)
else:
LOG.debug('Error: obj is None')
def __build_event_pair(self, state, event_type, event_map, description): def __build_event_pair(self, state, event_type, event_map, description):
""" """
@ -5739,7 +5751,10 @@ class GedcomParser(UpdateCallback):
if self.use_def_src and len(obj.get_source_references()) == 0: if self.use_def_src and len(obj.get_source_references()) == 0:
sref = gen.lib.SourceRef() sref = gen.lib.SourceRef()
sref.set_reference_handle(self.def_src.handle) sref.set_reference_handle(self.def_src.handle)
if obj:
obj.add_source_reference(sref) obj.add_source_reference(sref)
else:
LOG.debug('Error: obj is None')
def __subm_name(self, line, state): def __subm_name(self, line, state):
""" """