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

refactored SimpleTable; QuickReports can return values; date diffs return Span

Browse Source 
svn: r10578
This commit is contained in:
Doug Blank
2008-04-18 01:09:32 +00:00
parent e910a131a9
commit 2098a01f8d
13 changed files with 141 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gen/db/dbdir.py
View File

@@ -1758,7 +1758,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback):
birth_ref_index, # 6
event_ref_list, # 7
family_list, # 8
arent_family_list, # 9
parent_family_list, # 9
media_list, # 10
address_list, # 11
attribute_list, # 12
@@ -1800,7 +1800,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback):
birth_ref_index, # 6
event_ref_list, # 7
family_list, # 8
arent_family_list, # 9
parent_family_list, # 9
media_list, # 10
new_address_list, # 11
attribute_list, # 12

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

@@ -69,6 +69,26 @@ class DateError(Exception):
def __str__(self):
return self.value
class Span:
""" Class used in date differences """
def __init__(self, *diff_tuple):
self.diff_tuple = diff_tuple
def __getitem__(self, pos):
return self.diff_tuple[pos]
def __repr__(self):
if self.diff_tuple[1] != 0:
retval = ((_("%d years") % self.diff_tuple[0])+ ", " +
(_("%d months") % self.diff_tuple[1]))
else:
retval = (_("%d years") % self.diff_tuple[0])
return retval
def __int__(self):
return int(self.diff_tuple[0] * 12 + self.diff_tuple[1]) # months
#-------------------------------------------------------------------------
#
# Date class
@@ -302,9 +322,9 @@ class Date:
d1, d2 = d2, d1
date1, date2 = date2, date1
# d1 - d2 (1998, 12, 32) - (1982, 12, 15)
if self.calendar != other.calendar:
if date1.calendar != date2.calendar:
diff = date1.sortval - date2.sortval
return (diff/365, (diff % 365)/30, (diff % 365) % 30)
return Span(diff/365, (diff % 365)/30, (diff % 365) % 30)
# days:
if d2[2] > d1[2]:
# months:
@@ -329,24 +349,24 @@ class Date:
# estimate: (years, months, days)
# Check transitivity:
eDate = date1 - (years, months, days)
if eDate < date2: # too small
if eDate << date2: # too small, strictly less than
diff = 0
while eDate < date2 and diff < 60:
diff += 1
eDate = eDate + (0, 0, diff)
if diff == 60:
return None
return (years, months, days - diff)
elif eDate > date2:
return Span(-1, -1, -1)
return Span(years, months, days - diff)
elif eDate >> date2:
diff = 0
while eDate > date2 and diff > -60:
diff -= 1
eDate = eDate - (0, 0, abs(diff))
if diff == -60:
return None
return (years, months, days + diff)
return Span(-1, -1, -1)
return Span(years, months, days + diff)
else:
return (years, months, days)
return Span(years, months, days)
else:
raise AttributeError, "unknown date sub type: %s " % type(other)
@@ -354,12 +374,30 @@ class Date:
#def __eq__(self, other):
# return self.sortval == other.sortval
def __contains__(self, string):
"""
For use with "x in Date" syntax.
"""
return (str(string) in self.text)
def __lshift__(self, other):
"""
Comparison for strictly less than.
"""
return self.match(other, comparison="<<")
def __lt__(self, other):
"""
Comparison for less than.
"""
return self.match(other, comparison="<")
def __rshift__(self, other):
"""
Comparison for strictly greater than.
"""
return self.match(other, comparison=">>")
def __gt__(self, other):
"""
Comparison for greater than.