gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'sort' into 1.9.3

Browse Source
This commit is contained in:
Paul Beckingham
2010-07-29 14:50:54 -04:00
parent 2ef30b1183 a3f1aba6f0
commit 9cab648d8a
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Table.cpp
View File

@@ -604,6 +604,14 @@ bool sort_compare (int left, int right)
Grid::Cell* cell_left = table->mData.byRow (left, column);
Grid::Cell* cell_right = table->mData.byRow (right, column);
// Equally NULL - next column.
if (cell_left == NULL && cell_right == NULL)
continue;
// Equal - next column
if (cell_left && cell_right && *cell_left == *cell_right)
continue;
// nothing < something.
if (cell_left == NULL && cell_right != NULL)
return (sort_type == Table::ascendingNumeric ||
@@ -622,14 +630,6 @@ bool sort_compare (int left, int right)
sort_type == Table::ascendingDueDate ||
sort_type == Table::ascendingPeriod) ? false : true;
// Equally NULL - next column.
if (cell_left == NULL && cell_right == NULL)
continue;
// Equal - next column
if (cell_left && cell_right && *cell_left == *cell_right)
continue;
// Differing data - do a proper comparison.
if (cell_left && cell_right)
{