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

Merge pull request #191 from prculley/bug9479

Browse Source 
Bug 9479 Gedcom import loses spaces in text fields from FTM
This commit is contained in:
Doug Blank 2016-07-16 12:03:37 -04:00 committed by GitHub
commit 61f6015aba
2 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
data/tests/imp_test_FTM_CONC.difs
View File

@ -1,17 +0,0 @@
Mismatch on file: imp_test_FTM_CONC.ged
Source: S0029 handle=0000000500000005
Diff on: Source, pubinfo
<class 'str'>73: Name: Ancestry.com Operations, Inc.; Location: Provo, UT, USA; Date:2009;
<class 'str'>74: Name: Ancestry.com Operations, Inc.; Location: Provo, UT, USA; Date: 2009;
Citation: C0000 handle=0000000600000006
Diff on: Citation, page
<class 'str'>102: Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll:M432_394; Page: 435B; Image: 248
<class 'str'>103: Year: 1850; Census Place: District 14, Cape Girardeau, Missouri; Roll: M432_394; Page: 435B; Image: 248
Note: N0000 handle=0000000200000002
Diff on: Note, text, string
<class 'str'>54: The FTM way to do a CONC line with space at end --><--
<class 'str'>55: The FTM way to do a CONC line with space at end --> <--
Note: N0002 handle=0000000400000004
Diff on: Note, text, string
<class 'str'>136: Be nice if we supported FTM way to do CONC sousers would not have to spell check and edit their whole database for these kind of errors.
<class 'str'>137: Be nice if we supported FTM way to do CONC so users would not have to spell check and edit their whole database for these kind of errors.

5
gramps/plugins/lib/libgedcom.py
View File

@ -783,7 +783,10 @@ class Lexer:
# There will normally only be one space between tag and # There will normally only be one space between tag and
# line_value, but in case there is more then one, remove extra # line_value, but in case there is more then one, remove extra
# spaces after CONC/CONT processing # spaces after CONC/CONT processing
data = data[:2] + (data[2].strip(),) + data[3:] # Also, Gedcom spec says there should be no spaces at end of
# line, however some programs put them there (FTM), so let's
# leave them in place.
data = data[:2] + (data[2].lstrip(),) + data[3:]
self.current_list.insert(0, data) self.current_list.insert(0, data)
def clean_up(self): def clean_up(self):