From a22d173b9b8baaa59c7c756c163baafb8e62797e Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 11 Jan 2015 09:07:04 -0500 Subject: [PATCH] TW-1487 - TW-1487 Task export exports some numeric attributes as strings (thanks to Tomas Babej). --- ChangeLog | 2 ++ src/Task.cpp | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95f086b4a..72a87fc2a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ - TW-1484 The 'history' and 'ghistory' reports do not obey rc.color.label. - TW-1486 task wait shows completed tasks which has a wait attribute (thanks to Sujeevan Vijayakumaran). +- TW-1487 Task export exports some numeric attributes as strings (thanks to + Tomas Babej). - TW-1492 compiling v2.4.0 using musl(libc) (thanks to V.Krishn). - TW-1495 German translation for taskwarrior (thanks to Jens Erat). - TW-1498 Filtering for presence of UDA matches all tasks (thanks to Ralph diff --git a/src/Task.cpp b/src/Task.cpp index 33f23e8e4..a0f66e955 100644 --- a/src/Task.cpp +++ b/src/Task.cpp @@ -829,6 +829,16 @@ std::string Task::composeJSON (bool decorate /*= false*/) const ++attributes_written; } + else if (type == "numeric") + { + out << "\"" + << i->first + << "\":" + << i->second; + + ++attributes_written; + } + // Tags are converted to an array. else if (i->first == "tags") { @@ -847,6 +857,8 @@ std::string Task::composeJSON (bool decorate /*= false*/) const } out << "]"; + + ++attributes_written; } // Everything else is a quoted value. @@ -894,9 +906,8 @@ std::string Task::composeJSON (bool decorate /*= false*/) const // Include urgency. if (decorate) out << "," - << "\"urgency\":\"" - << urgency_c () - <<"\""; + << "\"urgency\":" + << urgency_c (); #endif out << "}";