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

DateParserEN failures under the DateTest tool

Browse Source 
Issue #7084
This commit is contained in:
Paul Franklin
2017-09-22 11:51:30 -07:00
parent 61552f6903
commit 829a8bd01d
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gramps/gen/datehandler/_dateparser.py
View File

@@ -449,8 +449,8 @@ class DateParser:
self._modifier_after = re.compile('(.*)\s+%s' % self._mod_after_str, self._modifier_after = re.compile('(.*)\s+%s' % self._mod_after_str,
re.IGNORECASE) re.IGNORECASE)
self._abt2 = re.compile('<(.*)>', re.IGNORECASE) self._abt2 = re.compile('<(.*)>', re.IGNORECASE)
self._text = re.compile('%s\.?\s+(\d+)?\s*,?\s*((\d+)(/\d+)?)?\s*$' % self._mon_str, self._text = re.compile('%s\.?(\s+\d+)?\s*,?\s+((\d+)(/\d+)?)?\s*$'
re.IGNORECASE) % self._mon_str, re.IGNORECASE)
# this next RE has the (possibly-slashed) year at the string's end # this next RE has the (possibly-slashed) year at the string's end
self._text2 = re.compile('(\d+)?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$' % self._mon_str, self._text2 = re.compile('(\d+)?\s+?%s\.?\s*((\d+)(/\d+)?)?\s*$' % self._mon_str,
re.IGNORECASE) re.IGNORECASE)
@@ -542,7 +542,9 @@ class DateParser:
y = int(groups[3]) y = int(groups[3])
s = False s = False
value = (d, m, y, s) value = (d, m, y, s)
if check and not check((d, m, y)): if s and julian_valid(value): # slash year
pass
elif check and not check((d, m, y)):
value = Date.EMPTY value = Date.EMPTY
return value return value
@@ -670,6 +672,15 @@ class DateParser:
y = self._get_int(groups[1]) y = self._get_int(groups[1])
m = self._get_int(groups[3]) m = self._get_int(groups[3])
d = self._get_int(groups[4]) d = self._get_int(groups[4])
if m > 12: # maybe a slash year, not a month (1722/3 is March)
if y % 100 == 99:
modyear = (y + 1) % 1000
elif y % 10 == 9:
modyear = (y + 1) % 100
else:
modyear = (y + 1) % 10
if m == modyear:
return (0, 0, y + 1, True) # slash year
else: else:
y = self._get_int(groups[4]) y = self._get_int(groups[4])
if self.dmy: if self.dmy:
@@ -682,6 +693,15 @@ class DateParser:
else: else:
m = self._get_int(groups[1]) m = self._get_int(groups[1])
d = self._get_int(groups[3]) d = self._get_int(groups[3])
if m > 12: # maybe a slash year, not a month
if m % 100 == 99:
modyear = (m + 1) % 1000
elif m % 10 == 9:
modyear = (m + 1) % 100
else:
modyear = (m + 1) % 10
if y == modyear:
return (0, 0, m + 1, True) # slash year
value = (d, m, y, False) value = (d, m, y, False)
if check and not check((d, m, y)): if check and not check((d, m, y)):
value = Date.EMPTY value = Date.EMPTY