diff --git a/ChangeLog b/ChangeLog index 15488c852..b6c16dad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,8 @@ Bugs + Fixed bug #1056, where CmdSummary did not print abstract parents. + Fixed bug #1059, where CmdEdit was running garbage collection. + Fixed bug #1060, where an error was not thrown correctly. + + Fixed bug #1063, so that numeric UDA fields are now sortable (thanks to Max + Muller). + Fixed bug #1065, where CmdShow issued messages in incorrect situations. + Partially fixed #1083, which showed 'task 0 ...' when modifying a non- pending task (thanks to Aikido Guy). diff --git a/src/sort.cpp b/src/sort.cpp index babf7b055..3829bb78a 100644 --- a/src/sort.cpp +++ b/src/sort.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -231,8 +232,8 @@ static bool sort_compare (int left, int right) std::string type = column->type (); if (type == "numeric") { - left_real = (*global_data)[left].urgency (); - right_real = (*global_data)[right].urgency (); + const float left_real = strtof (((*global_data)[left].get_ref (field)).c_str (), NULL); + const float right_real = strtof (((*global_data)[right].get_ref (field)).c_str (), NULL); if (left_real == right_real) continue; diff --git a/test/bug.1063.t b/test/bug.1063.t new file mode 100755 index 000000000..a94c6f0f2 --- /dev/null +++ b/test/bug.1063.t @@ -0,0 +1,77 @@ +#! /usr/bin/env perl +################################################################################ +## taskwarrior - a command line task list manager. +## +## Copyright 2006-2012, Paul Beckingham, Federico Hernandez. +## +## Permission is hereby granted, free of charge, to any person obtaining a copy +## of this software and associated documentation files (the "Software"), to deal +## in the Software without restriction, including without limitation the rights +## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +## copies of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be included +## in all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +## SOFTWARE. +## +## http://www.opensource.org/licenses/mit-license.php +## +################################################################################ + +use strict; +use warnings; +use Test::More tests => 8; +use File::Basename; + +my $ut = basename ($0); +my $rc = $ut . '.rc'; + +# Create the rc file. +if (open my $fh, '>', $rc) +{ + print $fh "data.location=.\n", + "confirmation=off\n", + "uda.foo.type=numeric\n", + "uda.foo.label=Foo\n", + "report.bar.columns=foo,description\n", + "report.bar.description=Bar\n", + "report.bar.labels=Foo,Desc\n", + "report.bar.sort=foo-\n"; + close $fh; + ok (-r $rc, "$ut: Created $rc"); +} + +# Bug 1063 - Numeric UDA fields are not sortable. +qx{../src/task rc:$rc add four foo:4 2>&1}; +ok ($? == 0, "$ut: add four"); +qx{../src/task rc:$rc add one foo:1 2>&1}; +ok ($? == 0, "$ut: add one"); +qx{../src/task rc:$rc add three foo:3 2>&1}; +ok ($? == 0, "$ut: add three"); +qx{../src/task rc:$rc add two foo:2 2>&1}; +ok ($? == 0, "$ut: add two"); + +my $output = qx{../src/task rc:$rc bar 2>&1}; +like ($output, qr/4.+3.+2.+1/ms, "$ut: Default descending sort correct"); + +$output = qx{../src/task rc:$rc bar rc.report.bar.sort=foo+ 2>&1}; +like ($output, qr/1.+2.+3.+4/ms, "$ut: Default ascending sort correct"); + +## Cleanup. +unlink qw(pending.data completed.data undo.data backlog.data synch.key), $rc; +ok (! -r 'pending.data' && + ! -r 'completed.data' && + ! -r 'undo.data' && + ! -r 'backlog.data' && + ! -r 'synch.key' && + ! -r $rc, "$ut: Cleanup"); + +exit 0;