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

Fixed error in sorting date spans, and refined span comparisons

Browse Source 
svn: r13303
This commit is contained in:
Doug Blank 2009-10-04 15:13:07 +00:00
parent ae4c341777
commit 09497d5576
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,18 +269,25 @@ class Span(object):
return self._diff(self.date1, self.date2)[pos] return self._diff(self.date1, self.date2)[pos]
def __int__(self): def __int__(self):
"""
Returns the number of months of span.
"""
if self.negative: if self.negative:
return -self.sort[0] return -(self.sort[0] * 12 + self.sort[1])
else: else:
return self.sort[0] return (self.sort[0] * 12 + self.sort[1])
def __cmp__(self, other): def __cmp__(self, other):
"""
Comparing two Spans for SORTING purposes.
Use cmp(abs(int(span1)), abs(int(span2))) for comparing
actual spans of times, as spans have directionality
as indicated by negative values.
"""
if other is None: if other is None:
return cmp(self.sort, (-9999, -9999)) return cmp(int(self), -9999)
elif self.negative:
return cmp((-self.sort[0], self.sort[1]), other.sort)
else: else:
return cmp(self.sort, other.sort) return cmp(int(self), int(other))
def __repr__(self): def __repr__(self):
if self.repr is not None: if self.repr is not None:
@ -446,27 +453,27 @@ class Span(object):
def __eq__(self, other): def __eq__(self, other):
""" """
For comparing of Spans. Uses the sort tuple pair. For comparing of Spans. Uses the integer representation.
""" """
if other is None: if other is None:
return False return False
return self.sort == other.sort return int(self) == int(other)
def __lt__(self, other): def __lt__(self, other):
""" """
For less-than comparing of Spans. Uses the sort tuple pair. For less-than comparing of Spans. Uses the integer representation.
""" """
if other is None: if other is None:
return False return False
return self.sort < other.sort return int(self) < int(other)
def __gt__(self, other): def __gt__(self, other):
""" """
For greater-than comparing of Spans. Uses the sort tuple pair. For greater-than comparing of Spans. Uses the integer representation.
""" """
if other is None: if other is None:
return True return True
return self.sort > other.sort return int(self) > int(other)
def format(self, precision=2): def format(self, precision=2):
""" """