From 78c79202defc5647a67d71e1c116d8aea6bdaf51 Mon Sep 17 00:00:00 2001 From: kulath Date: Fri, 24 Apr 2015 10:51:08 +0100 Subject: [PATCH] 0001360: Gedcom input: SUBN and SUBM record handling Fixed: (a) Additional spaces beyond the first between a GEDCOM tag and the rest of the line are not ignored. (b) The SUBMitter name is ignored (it is overwritten by the XREF). (c) SUBmissioN data items are not committed to the database. --- src/plugins/lib/libgedcom.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/lib/libgedcom.py b/src/plugins/lib/libgedcom.py index 4d5526108..dfc193248 100644 --- a/src/plugins/lib/libgedcom.py +++ b/src/plugins/lib/libgedcom.py @@ -757,6 +757,10 @@ class Lexer(object): if func: func(data) else: + # There will normally only be one space between tag and + # line_value, but in case there is more then one, remove extra + # spaces after CONC/CONT processing + data = data[:2] + (data[2].strip(),) + data[3:] self.current_list.insert(0, data) def clean_up(self): @@ -3260,7 +3264,10 @@ class GedcomParser(UpdateCallback): if line.token_text == self.subm and self.import_researcher: self.dbase.set_researcher(state.res) - submitter_name = _("SUBM (Submitter): @%s@") % line.token_text + if state.res.get_name() == "": + submitter_name = _("SUBM (Submitter): @%s@") % line.token_text + else: + submitter_name = _("SUBM (Submitter): %s") % state.res.get_name() if self.use_def_src: repo.set_name(submitter_name) repo.set_handle(Utils.create_id()) @@ -7250,6 +7257,7 @@ class GedcomParser(UpdateCallback): if self.use_def_src and msg != "": self.def_src.set_data_item(msg, line.data) + self.dbase.commit_source(self.def_src, self.trans) def handle_source(self, line, level, state): """