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

Merge branch 'master' into geps/gep-032-database-backend

Browse Source
This commit is contained in:
Doug Blank 2015-05-14 11:07:27 -04:00
commit c01e9860bf
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gramps/gen/datehandler/_date_ja.py
View File

@ -68,6 +68,7 @@ class DateParserJA(DateParser):
quality_to_int = { quality_to_int = {
'およそ' : Date.QUAL_ESTIMATED, 'およそ' : Date.QUAL_ESTIMATED,
'ごろ' : Date.QUAL_ESTIMATED, 'ごろ' : Date.QUAL_ESTIMATED,
'位' : Date.QUAL_ESTIMATED,
'計算上' : Date.QUAL_CALCULATED, '計算上' : Date.QUAL_CALCULATED,
} }
@ -166,12 +167,13 @@ class DateParserJA(DateParser):
_span_2 = ['まで', ''] _span_2 = ['まで', '']
_range_1 = ['から', 'と', '~', '〜'] _range_1 = ['から', 'と', '~', '〜']
_range_2 = ['までの間', 'の間'] _range_2 = ['までの間', 'の間']
self._span = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % self._span = re.compile("(?P<start>.+)(%s)(?P<stop>\d+)(%s)" %
('|'.join(_span_1), '|'.join(_span_2)), ('|'.join(_span_1), '|'.join(_span_2)),
re.IGNORECASE) re.IGNORECASE)
self._range = re.compile("(%s)\s+(?P<start>.+)\s+(%s)\s+(?P<stop>.+)" % self._range = re.compile("(?P<start>.+)(%s)(?P<stop>.+)(%s)" %
('|'.join(_range_1), '|'.join(_range_2)), ('|'.join(_range_1), '|'.join(_range_2)),
re.IGNORECASE) re.IGNORECASE)
self._numeric = re.compile("((\d+)年\s*)?((\d+)月\s*)?(\d+)?日?\s*$")
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -215,6 +217,9 @@ class DateDisplayJA(DateDisplay):
value = str(date_val[2]) value = str(date_val[2])
else: else:
value = self._tformat.replace('%m', str(date_val[1])) value = self._tformat.replace('%m', str(date_val[1]))
if date_val[0] == 0: # ignore the zero day and its delimiter
i_day = value.find('%d')
value = value.replace(value[i_day:i_day+3], '')
value = value.replace('%d', str(date_val[0])) value = value.replace('%d', str(date_val[0]))
value = value.replace('%Y', str(date_val[2])) value = value.replace('%Y', str(date_val[2]))

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

@ -614,6 +614,8 @@ class DateParser(object):
match = self._numeric.match(text) match = self._numeric.match(text)
if match: if match:
groups = match.groups() groups = match.groups()
if groups == (None, None, None, None, None):
return Date.EMPTY
if self.ymd: if self.ymd:
# '1789' and ymd: incomplete date # '1789' and ymd: incomplete date
if groups[1] is None: if groups[1] is None: