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

2007-10-17 Douglas S. Blank <dblank@cs.brynmawr.edu>

Browse Source 
* src/gen/lib/date.py: added method Date.offset(value) -> (y,m,d)



svn: r9200
This commit is contained in:
Doug Blank
2007-10-17 04:07:26 +00:00
parent a1887f46b8
commit 5d276ee146
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -1,3 +1,6 @@
2007-10-17 Douglas S. Blank <dblank@cs.brynmawr.edu>
* src/gen/lib/date.py: added method Date.offset(value) -> (y,m,d)
2007-10-16 Don Allingham <don@gramps-project.org> 2007-10-16 Don Allingham <don@gramps-project.org>
* src/DataViews/_PersonView.py (PersonView.delete_person_response): * src/DataViews/_PersonView.py (PersonView.delete_person_response):
use gen.utils.delete_person_from_database use gen.utils.delete_person_from_database

29
src/gen/lib/date.py
View File

@@ -265,8 +265,7 @@ class Date:
""" """
new_date = Date() new_date = Date()
new_date.set_yr_mon_day(dateval[0], dateval[1], dateval[2]) new_date.set_yr_mon_day(dateval[0], dateval[1], dateval[2])
return Date._calendar_change[Date.CAL_GREGORIAN]( return new_date.offset(offset)
new_date.sortval + offset)
datecopy = Date(self) datecopy = Date(self)
#we do all calculation in Gregorian calendar #we do all calculation in Gregorian calendar
@@ -333,17 +332,13 @@ class Date:
other_start, other_stop = other_date.get_start_stop_range() other_start, other_stop = other_date.get_start_stop_range()
self_start, self_stop = self.get_start_stop_range() self_start, self_stop = self.get_start_stop_range()
##DEBUG print " date compare:", self_start, self_stop, other_start, #DEBUG print "compare:",self_start,self_stop,other_start,other_stop
##DEBUG other_stop
# If some overlap then match is True, otherwise False. # If some overlap then match is True, otherwise False.
if ((self_start <= other_start <= self_stop) or return ((self_start <= other_start <= self_stop) or
(self_start <= other_stop <= self_stop) or (self_start <= other_stop <= self_stop) or
(other_start <= self_start <= other_stop) or (other_start <= self_start <= other_stop) or
(other_start <= self_stop <= other_stop)): (other_start <= self_stop <= other_stop))
return True
else:
return False
def __str__(self): def __str__(self):
""" """
@@ -759,13 +754,19 @@ class Date:
and self.get_year_valid() and self.get_month_valid() \ and self.get_year_valid() and self.get_month_valid() \
and self.get_day_valid() and self.get_day_valid()
def offset(self, value):
"""
Returns (year, month, day) of this date +- value.
"""
return Date._calendar_change[Date.CAL_GREGORIAN](self.sortval + value)
# if __name__ == "__main__": # if __name__ == "__main__":
# # Test function. Call it as follows from the command line (so as to find # # Test function. Call it as follows from the command line (so as to find
# # imported modules): # # imported modules):
# # export PYTHONPATH=/path/to/gramps/src python src/gen.lib/_Date.py # # export PYTHONPATH=/path/to/gramps/src python src/gen/lib/date.py
# # # #
# from DateHandler import _DateParser # from DateHandler import parser as df
# df = _DateParser.DateParser() # date factory
# def test_date(d1, d2, expected1, expected2 = None): # def test_date(d1, d2, expected1, expected2 = None):
# if expected2 == None: # if expected2 == None:
# expected2 = expected1 # expected2 = expected1