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

fix invalid export (and import) of Gedcom EMAIL records (#455)

Browse Source 
Gedcom spec 5.5 requires '@' in general text to be doubled '@@'
fixes #10167
This commit is contained in:
Paul Culley 2017-09-09 17:33:23 -05:00 committed by Sam Manzi
parent c6f45af3f1
commit 231b15eca1
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/tests/exp_sample_ged.ged
View File

@ -1,12 +1,12 @@
0 HEAD 0 HEAD
1 SOUR Gramps 1 SOUR Gramps
2 VERS 5.0.0-alpha1 2 VERS 5.0.0-alpha2
2 NAME Gramps 2 NAME Gramps
1 DATE 29 OCT 2016 1 DATE 1 SEP 2017
2 TIME 15:10:31 2 TIME 12:10:38
1 SUBM @SUBM@ 1 SUBM @SUBM@
1 FILE C:\Users\prc\AppData\Roaming\gramps\temp\exp_sample_ged.ged 1 FILE C:\Users\prc\AppData\Roaming\gramps\temp\exp_sample_ged.ged
1 COPR Copyright (c) 2016 Alex Roitman,,,. 1 COPR Copyright (c) 2017 Alex Roitman,,,.
1 GEDC 1 GEDC
2 VERS 5.5.1 2 VERS 5.5.1
2 FORM LINEAGE-LINKED 2 FORM LINEAGE-LINKED
@ -17,7 +17,7 @@
1 ADDR Not Provided 1 ADDR Not Provided
2 ADR1 Not Provided 2 ADR1 Not Provided
1 PHON 666-555-4444 1 PHON 666-555-4444
1 EMAIL an_email@gmail.com 1 EMAIL an_email@@gmail.com
0 @I0000@ INDI 0 @I0000@ INDI
1 NAME Anna /Hansdotter/ 1 NAME Anna /Hansdotter/
2 GIVN Anna 2 GIVN Anna
@ -789,7 +789,7 @@
1 OBJE 1 OBJE
2 FORM jpeg 2 FORM jpeg
2 TITL Michael O'Toole 2015-11 2 TITL Michael O'Toole 2015-11
2 FILE c:\grampsaio64-4.9.9\share\gramps\tests\O0.jpg 2 FILE c:\grampsaio64-5.0.0\share\gramps\tests\O0.jpg
2 NOTE @N0019@ 2 NOTE @N0019@
1 NOTE @N0007@ 1 NOTE @N0007@
1 CHAN 1 CHAN
@ -820,7 +820,7 @@
3 CTRY USA 3 CTRY USA
2 PHON 440-871-3400 2 PHON 440-871-3400
2 PHON 800-871-3400 2 PHON 800-871-3400
2 EMAIL thetester@gmail.com 2 EMAIL thetester@@gmail.com
2 FAX 440-123-4567 2 FAX 440-123-4567
2 WWW http://thetester.com 2 WWW http://thetester.com
1 EVEN A very bad day 1 EVEN A very bad day
@ -862,7 +862,7 @@
2 DATE 30 DEC 1954 2 DATE 30 DEC 1954
2 PLAC 123 Main St., Winslow, PA, 12345 2 PLAC 123 Main St., Winslow, PA, 12345
2 PHON 440-871-3401 2 PHON 440-871-3401
2 EMAIL mrstester@gmail.com 2 EMAIL mrstester@@gmail.com
2 FAX 440-321-4568 2 FAX 440-321-4568
2 WWW http://mrstester.com 2 WWW http://mrstester.com
2 NOTE @N0011@ 2 NOTE @N0011@
@ -879,7 +879,7 @@
3 POST 12345 3 POST 12345
1 PHON 440-871-3401 1 PHON 440-871-3401
1 PHON 800-871-3401 1 PHON 800-871-3401
1 EMAIL mrstester@gmail.com 1 EMAIL mrstester@@gmail.com
1 FAX 440-321-4568 1 FAX 440-321-4568
1 WWW http://mrstester.com 1 WWW http://mrstester.com
1 NOTE @N0010@ 1 NOTE @N0010@
@ -904,7 +904,7 @@
3 STAE Colorado 3 STAE Colorado
3 CTRY USA 3 CTRY USA
2 PHON 440-871-3402 2 PHON 440-871-3402
2 EMAIL tomtester@gmail.com 2 EMAIL tomtester@@gmail.com
2 FAX 440-321-4569 2 FAX 440-321-4569
2 WWW http://tomtester.com 2 WWW http://tomtester.com
1 RESI 1 RESI
@ -1316,10 +1316,10 @@
2 ADR1 360 W 4800 N, Provo, UT 84604 2 ADR1 360 W 4800 N, Provo, UT 84604
1 PHON (801) 705-7000 1 PHON (801) 705-7000
1 FAX (801) 705-7001 1 FAX (801) 705-7001
1 EMAIL help@ancestry.com 1 EMAIL help@@ancestry.com
1 WWW http://www.ancestry.com 1 WWW http://www.ancestry.com
0 @R0001@ REPO 0 @R0001@ REPO
1 NAME SUBM (Submitter): (@SUBM@) The Subm /Tester/ 1 NAME SUBM (Submitter): (@@SUBM@@) The Subm /Tester/
1 ADDR 123 Main St. 1 ADDR 123 Main St.
2 CONT Winslow 2 CONT Winslow
2 CONT PA 2 CONT PA
@ -1329,7 +1329,7 @@
2 STAE PA 2 STAE PA
2 POST 12345 2 POST 12345
1 PHON 440-871-3401 1 PHON 440-871-3401
1 EMAIL mrstester@gmail.com 1 EMAIL mrstester@@gmail.com
1 FAX 440-321-4568 1 FAX 440-321-4568
1 WWW http://mrstester.com 1 WWW http://mrstester.com
1 NOTE @N0009@ 1 NOTE @N0009@
@ -1362,7 +1362,7 @@
1 ADDR 123 High St., OSF village, CA, USA 1 ADDR 123 High St., OSF village, CA, USA
2 ADR1 123 High St., OSF village, CA, USA 2 ADR1 123 High St., OSF village, CA, USA
1 PHON 988-765-4321 1 PHON 988-765-4321
1 EMAIL tester_repo@osf.com 1 EMAIL tester_repo@@osf.com
1 FAX 987-654-3210 1 FAX 987-654-3210
1 WWW http://www.tester_repo.com 1 WWW http://www.tester_repo.com
1 NOTE @N0012@ 1 NOTE @N0012@
@ -1401,8 +1401,8 @@
1 CONT 1 CONT
1 CONT Only one phone number supported Lin 1 CONT Only one phone number supported Lin
1 CONC e 9: 3 PHON (800) 705-7000 1 CONC e 9: 3 PHON (800) 705-7000
0 @N0009@ NOTE Records not imported into SUBM (Submitter): (@SUBM@) The Subm /Test 0 @N0009@ NOTE Records not imported into SUBM (Submitter): (@@SUBM@@) The Subm /Te
1 CONC er/: 1 CONC ster/:
1 CONT 1 CONT
1 CONT Only one phone number supported Lin 1 CONT Only one phone number supported Lin
1 CONC e 29: 1 PHON 800-871-3401 1 CONC e 29: 1 PHON 800-871-3401

2
data/tests/imp_PhonFax_dfs.ged
View File

@ -44,7 +44,7 @@
3 FORM Street, City, County, State, Country, Zip code 3 FORM Street, City, County, State, Country, Zip code
2 PHON 440-871-3400 2 PHON 440-871-3400
2 PHON 800-871-3400 2 PHON 800-871-3400
2 EMAIL thetester@gmail.com 2 EMAIL thetester@@gmail.com
2 FAX 440-123-4567 2 FAX 440-123-4567
2 WWW http://thetester.com 2 WWW http://thetester.com
0 @I1@ INDI 0 @I1@ INDI

3
gramps/plugins/export/exportgedcom.py
View File

@ -278,6 +278,9 @@ class GedcomWriter(UpdateCallback):
# break the line into multiple lines if a newline is found # break the line into multiple lines if a newline is found
textlines = textlines.replace('\n\r', '\n') textlines = textlines.replace('\n\r', '\n')
textlines = textlines.replace('\r', '\n') textlines = textlines.replace('\r', '\n')
# Need to double '@' See Gedcom 5.5 spec 'any_char'
if not textlines.startswith('@'): # avoid xrefs
textlines = textlines.replace('@', '@@')
textlist = textlines.split('\n') textlist = textlines.split('\n')
token_level = level token_level = level
for text in textlist: for text in textlist:

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

@ -937,6 +937,8 @@ class Lexer:
self.__add_msg(message) self.__add_msg(message)
continue continue
# Need to un-double '@' See Gedcom 5.5 spec 'any_char'
line_value = line_value.replace('@@', '@')
token = TOKENS.get(tag, TOKEN_UNKNOWN) token = TOKENS.get(tag, TOKEN_UNKNOWN)
data = (level, token, line_value, tag, self.index) data = (level, token, line_value, tag, self.index)