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

Filter

Browse source 
- Added domSource, and a context Task so that Eval can access attributes.
  Doesn't work.
This commit is contained in:
Paul Beckingham 2014-04-27 11:06:02 -07:00
parent e924468de6
commit 899e65714a
1 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Filter.cpp
View file

@ -35,6 +35,23 @@
extern Context context; extern Context context;
////////////////////////////////////////////////////////////////////////////////
// Const iterator that can be derefenced into a Task by domSource.
static std::vector <Task>::const_iterator contextTask;
////////////////////////////////////////////////////////////////////////////////
static bool domSource (const std::string& identifier, Variant& value)
{
std::string stringValue = context.dom.get (identifier, *contextTask);
if (stringValue != identifier)
{
value = Variant (stringValue);
return true;
}
return false;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
Filter::Filter () Filter::Filter ()
: _startCount (0) : _startCount (0)
@ -72,7 +89,7 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
Eval eval; Eval eval;
eval.addSource (namedDates); eval.addSource (namedDates);
// TODO Need DOM source. eval.addSource (domSource);
eval.compileExpression (filterExpr); eval.compileExpression (filterExpr);
std::vector <Task>::const_iterator task; std::vector <Task>::const_iterator task;
@ -82,6 +99,8 @@ void Filter::subset (const std::vector <Task>& input, std::vector <Task>& output
if (oldFilter) if (oldFilter)
output.push_back (*task); output.push_back (*task);
contextTask = task;
Variant var; Variant var;
eval.evaluateCompiledExpression (var); eval.evaluateCompiledExpression (var);
@ -122,7 +141,7 @@ void Filter::subset (std::vector <Task>& output)
Eval eval; Eval eval;
eval.addSource (namedDates); eval.addSource (namedDates);
// TODO Need DOM source. eval.addSource (domSource);
eval.compileExpression (filterExpr); eval.compileExpression (filterExpr);
output.clear (); output.clear ();
@ -134,6 +153,8 @@ void Filter::subset (std::vector <Task>& output)
if (oldFilter) if (oldFilter)
output.push_back (*task); output.push_back (*task);
contextTask = task;
Variant var; Variant var;
eval.evaluateCompiledExpression (var); eval.evaluateCompiledExpression (var);
@ -153,6 +174,8 @@ void Filter::subset (std::vector <Task>& output)
if (oldFilter) if (oldFilter)
output.push_back (*task); output.push_back (*task);
contextTask = task;
Variant var; Variant var;
eval.evaluateCompiledExpression (var); eval.evaluateCompiledExpression (var);