fix DateParser

svn: r5181
This commit is contained in:
Eero Tamminen
2005-09-05 18:52:21 +00:00
parent d4181a3e1e
commit dc465ec4bf
2 changed files with 14 additions and 10 deletions

View File

@@ -1,3 +1,6 @@
2005-09-05 Eero Tamminen <eerot@sf>
* src/DateParser.py: Fixed what I broke
2005-09-04 Don Allingham <don@gramps-project.org>
* NEWS: update for 2.0.7 release
* src/DateDisplay.py: handle BCE better

View File

@@ -514,16 +514,17 @@ class DateParser:
date.set(qual,mod,cal,start)
return True
# modifiers after the date
match = self._modifier_after.match(text)
if match:
grps = match.groups()
start = self._parse_subdate(grps[0])
mod = self.modifier_after_to_int.get(grps[1].lower(),Date.MOD_NONE)
if bc:
date.set(qual,mod,cal,self.invert_year(start))
else:
date.set(qual,mod,cal,start)
return True
if self.modifier_after_to_int:
match = self._modifier_after.match(text)
if match:
grps = match.groups()
start = self._parse_subdate(grps[0])
mod = self.modifier_after_to_int.get(grps[1].lower(),Date.MOD_NONE)
if bc:
date.set(qual,mod,cal,self.invert_year(start))
else:
date.set(qual,mod,cal,start)
return True
match = self._abt2.match(text)
if match:
grps = match.groups()