GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-24 18:06:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ColTypeString: Added validate() in ::modify

Browse source
This commit is contained in:
Paul Beckingham 2016-02-01 23:57:10 -05:00
parent db7ebf9029
commit 4b37fea21f
2 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/columns/ColTypeString.cpp
View file

@ -64,31 +64,41 @@ void ColumnTypeString::render (
////////////////////////////////////////////////////////////////////////////////
void ColumnTypeString::modify (Task& task, const std::string& value)
{
// Try to evaluate 'value'. It might work.
Variant evaluatedValue;
try
std::string label = " MODIFICATION ";
// Only if it's a DOM ref, eval it first.
Lexer lexer (value);
std::string domRef;
Lexer::Type type;
if (lexer.token (domRef, type) &&
type == Lexer::Type::dom)
{
Eval e;
e.addSource (domSource);
e.addSource (namedDates);
contextTask = task;
e.evaluateInfixExpression (value, evaluatedValue);
}
catch (...)
{
evaluatedValue = Variant (value);
}
std::string label = " MODIFICATION ";
std::string strValue = (std::string) evaluatedValue;
if (validate (strValue))
{
context.debug (label + _name + " <-- '" + strValue + "' <-- '" + value + "'");
task.set (_name, strValue);
Variant v;
e.evaluateInfixExpression (value, v);
std::string strValue = (std::string) v;
if (validate (strValue))
{
task.set (_name, strValue);
context.debug (label + _name + " <-- '" + strValue + "' <-- '" + value + "'");
}
else
throw format (STRING_INVALID_MOD, _name, value);
}
else
throw format (STRING_INVALID_MOD, _name, value);
{
if (validate (value))
{
task.set (_name, value);
context.debug (label + _name + " <-- '" + value + "'");
}
else
throw format (STRING_INVALID_MOD, _name, value);
}
}
////////////////////////////////////////////////////////////////////////////////