From 2ac5c2f897dfa8bec71e6321237cb4ef1c57617c Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 12 Feb 2011 14:16:06 -0500 Subject: [PATCH] Bug #628 - Fixed bug #628, where dateformats containing spaces were not properly parsed (thanks to Steve Rader). --- ChangeLog | 2 ++ src/Att.cpp | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03574a616..f60030f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -100,6 +100,8 @@ 'edit.verbose' can be set to 'no' and eliminate the help text when using the 'task edit' command (thanks to Steve Rader). + Enhanced unit tests in response to bug #624 (thanks to Steve Rader). + + Fixed bug #628, where dateformats containing spaces were not properly + parsed (thanks to Steve Rader). + Fixed bug #641, where certain reports broke when 'dateformat' differed from 'dateformat.report'. + Fixed bug #651, which broke the edit command when a task description diff --git a/src/Att.cpp b/src/Att.cpp index 1dfde4101..5fb4dc232 100644 --- a/src/Att.cpp +++ b/src/Att.cpp @@ -496,10 +496,12 @@ std::string Att::modType (const std::string& name) const } //////////////////////////////////////////////////////////////////////////////// -// +// ______________ +// | | +// | v // start --> name --> . --> mod --> : --> " --> value --> " --> end -// | ^ -// |_____________________| +// | ^ | ^ +// |_____________________| |_____________| // void Att::parse (const std::string& input) { @@ -537,8 +539,8 @@ void Att::parse (Nibbler& n) { // Both quoted and unquoted Att's are accepted. // Consider removing this for a stricter parse. - if (n.getQuoted ('"', mValue) || - n.getUntil (' ', mValue)) + if (n.getQuoted ('"', mValue) || + n.getUntilEOS (mValue)) { decode (mValue); }