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

Fixed numerical printing of partial dates, fixed entryCode change after

Browse Source 
adding range support


svn: r20
This commit is contained in:
Don Allingham 2001-05-17 13:25:28 +00:00
parent f0b5eefc48
commit 197ad9f1dc
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gramps/src/Date.py
View File

@ -33,6 +33,8 @@ _ = intl.gettext
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
class Date: class Date:
formatCode = 0 formatCode = 0
entryCode = 0
BadFormat = _("Unknown Format") BadFormat = _("Unknown Format")
Error = _("Illegal Date") Error = _("Illegal Date")
@ -163,8 +165,6 @@ class SingleDate:
before = 2 before = 2
after = 3 after = 3
entryCode = 0
mname = [ _("January"), mname = [ _("January"),
_("February"), _("February"),
_("March"), _("March"),
@ -519,10 +519,14 @@ class SingleDate:
elif self.day == -1: elif self.day == -1:
if self.month == -1: if self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
elif self.year == -1:
retval = "%d/??/??" % self.month+1
else:
retval = "%d/??/%d" % (self.month+1,self.year)
elif self.month == -1: elif self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
else: else:
if year == -1: if self.year == -1:
retval = "%d/%d/????" % (self.month+1,self.day) retval = "%d/%d/????" % (self.month+1,self.day)
else: else:
retval = "%d/%d/%d" % (self.month+1,self.day,self.year) retval = "%d/%d/%d" % (self.month+1,self.day,self.year)
@ -550,6 +554,10 @@ class SingleDate:
elif self.day == -1: elif self.day == -1:
if self.month == -1: if self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
elif self.year == -1:
retval = "%d-??-??" % self.month+1
else:
retval = "%d-??-%d" % (self.month+1,self.year)
elif self.month == -1: elif self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
else: else:
@ -581,6 +589,10 @@ class SingleDate:
elif self.day == -1: elif self.day == -1:
if self.month == -1: if self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
elif self.year == -1:
retval = "??/%d/??" % self.month+1
else:
retval = "??/%d/%d" % (self.month+1,self.year)
elif self.month == -1: elif self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
else: else:
@ -606,19 +618,21 @@ class SingleDate:
#-------------------------------------------------------------------- #--------------------------------------------------------------------
def getFmt7(self): def getFmt7(self):
retval = "" retval = ""
if self.month == -1 and self.day == -1 and self.year == -1 : if self.month == -1 and self.day == -1 and self.year == -1 :
pass pass
elif self.day == -1: elif self.day == -1:
if self.month == -1: if self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
elif self.year == -1:
retval = "??-%d-??" % self.month+1
else:
retval = "??-%d-%d" % (self.month+1,self.year)
elif self.month == -1: elif self.month == -1:
retval = "%d" % self.year retval = "%d" % self.year
elif self.year == -1:
retval = "%d-%d-????" % (self.day,self.month+1)
else: else:
if self.year == -1: retval = "%d-%d-%d" % (self.day,self.month+1,self.year)
retval = "%d-%d-????" % (self.day,self.month+1)
else:
retval = "%d-%d-%d" % (self.day,self.month+1,self.year)
if self.mode == SingleDate.about: if self.mode == SingleDate.about:
retval = "ABT" + ' ' + retval retval = "ABT" + ' ' + retval
@ -696,7 +710,7 @@ class SingleDate:
if match != None: if match != None:
matches = match.groups() matches = match.groups()
self.getMode(matches[0]) self.getMode(matches[0])
if SingleDate.entryCode == 0: if Date.entryCode == 0:
self.setMonth(string.atoi(matches[1])) self.setMonth(string.atoi(matches[1]))
self.setDay(string.atoi(matches[2])) self.setDay(string.atoi(matches[2]))
else: else:
@ -797,20 +811,26 @@ if __name__ == "__main__":
def checkit(s): def checkit(s):
d = Date() d = Date()
d.set(s) d.set(s)
print s, ':', d.getDate(), ':', d.getQuoteDate(),'\n' print s, ':', d.getDate(), ':', d.getQuoteDate()
checkit("June 11")
checkit("1923")
checkit("11/12/1293")
checkit("11 JAN 1923")
checkit("11-1-1929")
checkit("4/3/1203")
checkit("January 4, 1923")
checkit("before 3/3/1239")
checkit("est 2-3-1023")
checkit("between January 4, 1234 and NOV 4, 1245")
checkit("from 3-2-1234 to 5-4-2345")
for code in range(0,7):
Date.formatCode = code
Date.entryCode = 0
print "\nFormat Code = %d\n" % code
checkit("June 11")
checkit("1923")
checkit("11/12/1293")
checkit("11 JAN 1923")
checkit("11-1-1929")
checkit("4/3/1203")
checkit("January 4, 1923")
checkit("before 3/3/1239")
checkit("est 2-3-1023")
checkit("between January 4, 1234 and NOV 4, 1245")
checkit("from 3-2-1234 to 5-4-2345")
Date.entryCode = 1
checkit("1/12/1999")
checkit("12/11/1999")