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

* src/Date.py: Handle date ranges in the form of xxxx - xxxx

Browse Source 
svn: r1688
This commit is contained in:
Don Allingham 2003-06-11 01:35:04 +00:00
parent f31ad104f1
commit 8e3aed14df
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gramps2/src/Date.py
View File

@ -76,6 +76,7 @@ class Date:
tstr = _("(and|to|-)") tstr = _("(and|to|-)")
fmt = compile("\s*%s\s+(.+)\s+%s\s+(.+)\s*$" % (fstr,tstr),IGNORECASE) fmt = compile("\s*%s\s+(.+)\s+%s\s+(.+)\s*$" % (fstr,tstr),IGNORECASE)
fmt1 = compile("\s*([^-]+)\s*-\s*([^-]+)\s*$",IGNORECASE)
def __init__(self,source=None): def __init__(self,source=None):
if source: if source:
@ -193,8 +194,8 @@ class Date:
return compare_dates(self,other) == 0 return compare_dates(self,other) == 0
def set(self,text): def set(self,text):
match = Date.fmt.match(text)
try: try:
match = Date.fmt.match(text)
if match: if match:
matches = match.groups() matches = match.groups()
self.start.set(matches[1]) self.start.set(matches[1])
@ -203,9 +204,21 @@ class Date:
self.stop.calendar = self.calendar self.stop.calendar = self.calendar
self.stop.set(matches[3]) self.stop.set(matches[3])
self.range = 1 self.range = 1
else: return
self.start.set(text)
self.range = 0 match = Date.fmt1.match(text)
if match:
matches = match.groups()
self.start.set(matches[0])
if self.stop == None:
self.stop = SingleDate()
self.stop.calendar = self.calendar
self.stop.set(matches[1])
self.range = 1
return
self.start.set(text)
self.range = 0
except Errors.DateError: except Errors.DateError:
if text != "": if text != "":
self.range = -1 self.range = -1