From 023528e9cd47e358a6073b8b6c084816fdc9d648 Mon Sep 17 00:00:00 2001 From: Tim G L Lyons Date: Thu, 13 Jun 2013 18:06:33 +0000 Subject: [PATCH] 0000860: GEDCOM: Space in gramps id fails to properly export/import svn: r22500 --- gramps/plugins/lib/libgedcom.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gramps/plugins/lib/libgedcom.py b/gramps/plugins/lib/libgedcom.py index 10913d521..0d5712bf2 100644 --- a/gramps/plugins/lib/libgedcom.py +++ b/gramps/plugins/lib/libgedcom.py @@ -743,11 +743,19 @@ class Lexer(object): level = int(line[0]) # there should only be one space after the level, # but we can ignore more, + line = line[2].lstrip(' ') # then split into tag+delim+line_value # or xfef_id+delim+rest - line = line[2].lstrip(' ').partition(' ') - tag = line[0] - line_value = line[2] + # the xref_id can have spaces in it + if line.startswith('@'): + line = line.split('@', 2) + # line is now [None, alphanum+pointer_string, rest] + tag = '@' + line[1] + '@' + line_value = line[2] + else: + line = line.partition(' ') + tag = line[0] + line_value = line[2] except: continue