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

7045: Date.set on invalid date does not raise

Browse Source 
refactor _zero_adjust_ymd out of 3 cut-and-paste cases
the bug with the code inside it remains -- the negative years
should not be clamped to positive ones!!!!

svn: r23122
This commit is contained in:
Vassilii Khachaturov 2013-09-14 13:24:40 +00:00
parent ab7d12103f
commit 9c47f96b9c
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gramps/gen/lib/date.py
View File

@ -1487,6 +1487,12 @@ class Date(object):
""" """
return self.text return self.text
def _zero_adjust_ymd(self, y, m, d):
year = max(y, 1)
month = max(m, 1)
day = max(d, 1)
return (year, month, day)
def set(self, quality, modifier, calendar, value, text=None, def set(self, quality, modifier, calendar, value, text=None,
newyear=0): newyear=0):
""" """
@ -1536,9 +1542,10 @@ class Date(object):
self.calendar = calendar self.calendar = calendar
self.dateval = value self.dateval = value
self.set_new_year(newyear) self.set_new_year(newyear)
year = max(value[Date._POS_YR], 1) year, month, day = self._zero_adjust_ymd(
month = max(value[Date._POS_MON], 1) value[Date._POS_YR],
day = max(value[Date._POS_DAY], 1) value[Date._POS_MON],
value[Date._POS_DAY])
if year == month == day == 0: if year == month == day == 0:
self.sortval = 0 self.sortval = 0
@ -1616,9 +1623,10 @@ class Date(object):
""" """
Calculate the numerical sort value associated with the date. Calculate the numerical sort value associated with the date.
""" """
year = max(self.dateval[Date._POS_YR], 1) year, month, day = self._zero_adjust_ymd(
month = max(self.dateval[Date._POS_MON], 1) self.dateval[Date._POS_YR],
day = max(self.dateval[Date._POS_DAY], 1) self.dateval[Date._POS_MON],
self.dateval[Date._POS_DAY])
if year == month == 0 and day == 0: if year == month == 0 and day == 0:
self.sortval = 0 self.sortval = 0
else: else:
@ -1635,9 +1643,10 @@ class Date(object):
return return
(year, month, day) = Date._calendar_change[calendar](self.sortval) (year, month, day) = Date._calendar_change[calendar](self.sortval)
if self.is_compound(): if self.is_compound():
ryear = max(self.dateval[Date._POS_RYR], 1) ryear, rmonth, rday = self._zero_adjust_ymd(
rmonth = max(self.dateval[Date._POS_RMON], 1) self.dateval[Date._POS_RYR],
rday = max(self.dateval[Date._POS_RDAY], 1) self.dateval[Date._POS_RMON],
self.dateval[Date._POS_RDAY])
sdn = Date._calendar_convert[self.calendar](ryear, rmonth, rday) sdn = Date._calendar_convert[self.calendar](ryear, rmonth, rday)
(nyear, nmonth, nday) = Date._calendar_change[calendar](sdn) (nyear, nmonth, nday) = Date._calendar_change[calendar](sdn)
self.dateval = (day, month, year, False, self.dateval = (day, month, year, False,