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

Fix GEDCOM export of estimated/calculated dates with modifers

Browse Source 
Fixes #11513
This commit is contained in:
prculley 2020-01-07 13:46:26 -06:00 committed by Nick Hall
parent 04b1463746
commit 7ae77abead
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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.2 2 VERS 5.1.2
2 NAME Gramps 2 NAME Gramps
1 DATE 4 AUG 2019 1 DATE 7 JAN 2020
2 TIME 15:26:44 2 TIME 13:39:43
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) 2019 Alex Roitman,,,. 1 COPR Copyright (c) 2020 Alex Roitman,,,.
1 GEDC 1 GEDC
2 VERS 5.5.1 2 VERS 5.5.1
2 FORM LINEAGE-LINKED 2 FORM LINEAGE-LINKED
@ -911,7 +911,7 @@
2 DATE I think 1970 to 1971 2 DATE I think 1970 to 1971
2 PLAC San Francisco, San Francisco Co., CA 2 PLAC San Francisco, San Francisco Co., CA
1 SLGC 1 SLGC
2 DATE EST ABT 1999 2 DATE ABT 1999
2 FAMC @F0016@ 2 FAMC @F0016@
2 TEMP DENVE 2 TEMP DENVE
2 PLAC Denver, Denver Co., CO, Denver Co., Colorado, USA 2 PLAC Denver, Denver Co., CO, Denver Co., Colorado, USA
@ -1424,7 +1424,7 @@
0 @N0018@ NOTE Another Citation Note 0 @N0018@ NOTE Another Citation Note
0 @N0019@ NOTE A bad photo for sure 0 @N0019@ NOTE A bad photo for sure
0 @O0000@ OBJE 0 @O0000@ OBJE
1 FILE c:\users\prc\workspace\grampsm\main\data\tests\O0.jpg 1 FILE d:\users\prc\documents\gramps\data\tests\O0.jpg
2 FORM jpg 2 FORM jpg
2 TITL Michael O'Toole 2015-11 2 TITL Michael O'Toole 2015-11
1 NOTE @N0019@ 1 NOTE @N0019@

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

@ -1250,20 +1250,14 @@ class GedcomWriter(UpdateCallback):
if start != Date.EMPTY: if start != Date.EMPTY:
cal = date.get_calendar() cal = date.get_calendar()
mod = date.get_modifier() mod = date.get_modifier()
quality = date.get_quality() quality = None if mod else date.get_quality()
if quality in libgedcom.DATE_QUALITY:
qual_text = libgedcom.DATE_QUALITY[quality] + " "
else:
qual_text = ""
if mod == Date.MOD_SPAN: if mod == Date.MOD_SPAN:
val = "%sFROM %s TO %s" % ( val = "FROM %s TO %s" % (
qual_text,
libgedcom.make_gedcom_date(start, cal, mod, None), libgedcom.make_gedcom_date(start, cal, mod, None),
libgedcom.make_gedcom_date(date.get_stop_date(), libgedcom.make_gedcom_date(date.get_stop_date(),
cal, mod, None)) cal, mod, None))
elif mod == Date.MOD_RANGE: elif mod == Date.MOD_RANGE:
val = "%sBET %s AND %s" % ( val = "BET %s AND %s" % (
qual_text,
libgedcom.make_gedcom_date(start, cal, mod, None), libgedcom.make_gedcom_date(start, cal, mod, None),
libgedcom.make_gedcom_date(date.get_stop_date(), libgedcom.make_gedcom_date(date.get_stop_date(),
cal, mod, None)) cal, mod, None))