Fixed GEDCOM parsing of Julian dates
svn: r1106
This commit is contained in:
parent
f54076cbf7
commit
ea95ba1f6d
@ -102,7 +102,7 @@ headRE = re.compile(r"\s*(\d+)\s+HEAD")
|
|||||||
nameRegexp= re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?")
|
nameRegexp= re.compile(r"/?([^/]*)(/([^/]*)(/([^/]*))?)?")
|
||||||
snameRegexp= re.compile(r"/([^/]*)/")
|
snameRegexp= re.compile(r"/([^/]*)/")
|
||||||
calRegexp = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D([^@]+)@\s*(.*)$")
|
calRegexp = re.compile(r"\s*(ABT|BEF|AFT)?\s*@#D([^@]+)@\s*(.*)$")
|
||||||
fromtoRegexp = re.compile(r"\s*FROM\s+@#D([^@]+)@\s*(.*)\s+TO\s+@#D([^@]+)@\s*(.*)$")
|
fromtoRegexp = re.compile(r"\s*(FROM|BET)\s+@#D([^@]+)@\s*(.*)\s+(AND|TO)\s+@#D([^@]+)@\s*(.*)$")
|
||||||
|
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
#
|
#
|
||||||
@ -1593,7 +1593,7 @@ class GedcomParser:
|
|||||||
dateobj.set_calendar(Date.JULIAN)
|
dateobj.set_calendar(Date.JULIAN)
|
||||||
elif cal == "HEBREW":
|
elif cal == "HEBREW":
|
||||||
dateobj.set_calendar(Date.HEBREW)
|
dateobj.set_calendar(Date.HEBREW)
|
||||||
dateobj.set(data)
|
dateobj.set(data)
|
||||||
if abt:
|
if abt:
|
||||||
dateobj.get_start_date().setMode(abt)
|
dateobj.get_start_date().setMode(abt)
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user