From dc465ec4bfbf80e81b6fc4dccba3259cf5b47fbc Mon Sep 17 00:00:00 2001 From: Eero Tamminen Date: Mon, 5 Sep 2005 18:52:21 +0000 Subject: [PATCH] fix DateParser svn: r5181 --- gramps2/ChangeLog | 3 +++ gramps2/src/DateParser.py | 21 +++++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog index f5f19ab8c..90362456c 100644 --- a/gramps2/ChangeLog +++ b/gramps2/ChangeLog @@ -1,3 +1,6 @@ +2005-09-05 Eero Tamminen + * src/DateParser.py: Fixed what I broke + 2005-09-04 Don Allingham * NEWS: update for 2.0.7 release * src/DateDisplay.py: handle BCE better diff --git a/gramps2/src/DateParser.py b/gramps2/src/DateParser.py index 4f3421740..96bc0645f 100644 --- a/gramps2/src/DateParser.py +++ b/gramps2/src/DateParser.py @@ -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()