From 11225eb599d4cea9a748216aaf7d4ae5a1377b2a Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 12 Sep 2008 10:28:14 -0400
Subject: [PATCH] - Applied patch from Andy Lester to correct Table sorting to
 use the entire   string instead of just the initial characters.

---
 ChangeLog      | 4 +++-
 NEWS           | 1 +
 html/task.html | 2 ++
 src/Table.cpp  | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d9fc85a68..46bc94d04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,9 +7,11 @@ represents a feature release, and the Z represents a patch.
 
 ------ current release ---------------------------
 
-1.4.2 (8/26/2008)
+1.4.2 (9/12/2008)
   + "task undo" can now retract a "task done" command, provided no reports
     have been run (and therefore TDB::gc run)
+  + Task now correctly sorts on entire strings, instead of just the first
+    character (thanks to Andy Lester)
 
 ------ old releases ------------------------------
 
diff --git a/NEWS b/NEWS
index de3298f15..18b4251e8 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ Task has been built and tested on the following configurations:
   - Fedora Core 8
   - Fedora Core 9
   - Ubuntu 8 Hardy Heron
+  - Ubuntu 9 Feisty Fawn
   - Solaris 10
   - Cygwin 1.5.25-14
 
diff --git a/html/task.html b/html/task.html
index 8eacbdbd5..f87644136 100644
--- a/html/task.html
+++ b/html/task.html
@@ -94,6 +94,8 @@
                 <ul>
                   <li>"task undo" can now retract a "task done" command, provided no
                       reports have been run.
+                  <li>Task now correctly sorts on entire strings, instead of just the
+                      first character (thanks to Andy Lester).
                 </ul>
 
                 <p>
diff --git a/src/Table.cpp b/src/Table.cpp
index 89f65bdf9..e8cabef68 100644
--- a/src/Table.cpp
+++ b/src/Table.cpp
@@ -758,12 +758,12 @@ void Table::sort (std::vector <int>& order)
             break;
 
           case ascendingCharacter:
-            if ((char)*left > (char)*right)
+            if ((std::string)*left > (std::string)*right)
               SWAP
             break;
 
           case descendingCharacter:
-            if ((char)*left < (char)*right)
+            if ((std::string)*left < (std::string)*right)
               SWAP
             break;