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

2007-04-20 Don Allingham <don@gramps-project.org>

Browse Source 
* src/GrampsDb/_ReadGedcom.py: fix calendar parsing
	* src/GrampsDb/_WriteGedcom.py: fix calendar generation



svn: r8412
This commit is contained in:
Don Allingham 2007-04-21 04:30:13 +00:00
parent bc2ef71467
commit c1be620f90
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps2/ChangeLog
View File

@ -1,3 +1,7 @@
2007-04-20 Don Allingham <don@gramps-project.org>
* src/GrampsDb/_ReadGedcom.py: fix calendar parsing
* src/GrampsDb/_WriteGedcom.py: fix calendar generation
2007-04-20 Alex Roitman <shura@gramps-project.org> 2007-04-20 Alex Roitman <shura@gramps-project.org>
* src/plugins/Checkpoint.py (Checkpoint.rcs): Remove debugging * src/plugins/Checkpoint.py (Checkpoint.rcs): Remove debugging
output; Work out retrieval. output; Work out retrieval.

11
gramps2/src/GrampsDb/_ReadGedcom.py
View File

@ -183,9 +183,9 @@ intRE = re.compile(r"\s*(\d+)\s*$")
nameRegexp = re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?") nameRegexp = re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?")
snameRegexp = re.compile(r"/([^/]*)/([^/]*)") snameRegexp = re.compile(r"/([^/]*)/([^/]*)")
modRegexp = re.compile(r"\s*(EST|CAL)\s+(.*)$") modRegexp = re.compile(r"\s*(EST|CAL)\s+(.*)$")
calRegexp = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D([^@]+)@\s*(.*)$") calRegexp = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D?([^@]+)@\s*(.*)$")
rangeRegexp = re.compile(r"\s*BET\s+@#D([^@]+)@\s*(.*)\s+AND\s+@#D([^@]+)@\s*(.*)$") rangeRegexp = re.compile(r"\s*BET\s+@#D?([^@]+)@\s*(.*)\s+AND\s+@#D?([^@]+)@\s*(.*)$")
spanRegexp = re.compile(r"\s*FROM\s+@#D([^@]+)@\s*(.*)\s+TO\s+@#D([^@]+)@\s*(.*)$") spanRegexp = re.compile(r"\s*FROM\s+@#D?([^@]+)@\s*(.*)\s+TO\s+@#D?([^@]+)@\s*(.*)$")
intRegexp = re.compile(r"\s*INT\s+([^(]+)\((.*)\)$") intRegexp = re.compile(r"\s*INT\s+([^(]+)\((.*)\)$")
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -2456,7 +2456,10 @@ class GedcomParser(UpdateCallback):
match = calRegexp.match(text) match = calRegexp.match(text)
if match: if match:
(abt,cal,data) = match.groups() (abt,cal,data) = match.groups()
dateobj = self.dp.parse("%s %s" % (abt, data)) if abt:
dateobj = self.dp.parse("%s %s" % (abt, data))
else:
dateobj = self.dp.parse(data)
if cal == "FRENCH R": if cal == "FRENCH R":
dateobj.set_calendar(RelLib.Date.CAL_FRENCH) dateobj.set_calendar(RelLib.Date.CAL_FRENCH)
elif cal == "JULIAN": elif cal == "JULIAN":

6
gramps2/src/GrampsDb/_WriteGedcom.py
View File

@ -105,9 +105,9 @@ _month = [
"JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ] "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" ]
_calmap = { _calmap = {
RelLib.Date.CAL_HEBREW : (_hmonth, '@#HEBREW@'), RelLib.Date.CAL_HEBREW : (_hmonth, '@#DHEBREW@'),
RelLib.Date.CAL_FRENCH : (_fmonth, '@#FRENCH R@'), RelLib.Date.CAL_FRENCH : (_fmonth, '@#DFRENCH R@'),
RelLib.Date.CAL_JULIAN : (_month, '@#JULIAN@'), RelLib.Date.CAL_JULIAN : (_month, '@#DJULIAN@'),
} }
_caldef = { _caldef = {