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

Date comparison fix

Browse Source 
svn: r1125
This commit is contained in:
Don Allingham 2002-08-21 04:16:03 +00:00
parent e2eebf00d1
commit 7f0f45cb7b
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gramps/src/Date.py
View File

@ -1024,7 +1024,6 @@ def compare_dates(f,s):
return cmp(f.text,s.text) return cmp(f.text,s.text)
if f.range == -1 or s.range == -1: if f.range == -1 or s.range == -1:
return -1 return -1
first = f.get_start_date() first = f.get_start_date()
second = s.get_start_date() second = s.get_start_date()
if first.year != second.year: if first.year != second.year:
@ -1033,6 +1032,8 @@ def compare_dates(f,s):
return cmp(first.month,second.month) return cmp(first.month,second.month)
elif f.range != 1: elif f.range != 1:
return cmp(first.day,second.day) return cmp(first.day,second.day)
elif first.mode != second.mode:
return 1
else: else:
first = f.get_stop_date() first = f.get_stop_date()
second = s.get_stop_date() second = s.get_stop_date()
@ -1040,8 +1041,10 @@ def compare_dates(f,s):
return cmp(first.year,second.year) return cmp(first.year,second.year)
elif first.month != second.month: elif first.month != second.month:
return cmp(first.month,second.month) return cmp(first.month,second.month)
else: else if first.mode == second.mode:
return cmp(first.day,second.day) return cmp(first.day,second.day)
else:
return 1
_func = SingleDate.fmtFunc[0] _func = SingleDate.fmtFunc[0]