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

Merge changes from gramps20 made since 2.0.5

Browse Source 
svn: r5105
This commit is contained in:
Alex Roitman
2005-08-18 05:58:28 +00:00
parent b9f4134fdd
commit 704e0c4787
111 changed files with 31121 additions and 20132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Sort.py
View File

@@ -67,14 +67,14 @@ class Sort:
name1 = first.get_primary_name()
name2 = second.get_primary_name()
fsn = name1.get_surname().upper()
ssn = name2.get_surname().upper()
fsn = name1.get_surname()
ssn = name2.get_surname()
if fsn == ssn :
ffn = name1.get_first_name().upper()
sfn = name2.get_first_name().upper()
ffn = name1.get_first_name()
sfn = name2.get_first_name()
if ffn == sfn:
return locale.strcoll(name1.get_suffix().upper(), name2.get_suffix().upper())
return locale.strcoll(name1.get_suffix(), name2.get_suffix())
else:
return locale.strcoll(ffn, sfn)
else:
@@ -111,7 +111,10 @@ class Sort:
else:
date2 = Date.Date()
val = cmp(date1,date2)
dsv1 = date1.get_sort_value()
dsv2 = date2.get_sort_value()
val = cmp(dsv1,dsv2)
if val == 0:
return self.by_last_name(first_id,second_id)
return val