From 8f02fb1b132f2e54ca02f64d51ff7803ceac7e87 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sun, 11 May 2014 13:54:28 -0400 Subject: [PATCH] Filter - Clearly marked the obsolete code. --- src/Filter.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Filter.cpp b/src/Filter.cpp index e85fc21d4..24ce2b385 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -87,7 +87,7 @@ void Filter::subset (const std::vector & input, std::vector & output if (filterExpr.length ()) { - E9 e (filt); + E9 e9 (filt); Eval eval; eval.addSource (namedDates); @@ -102,7 +102,8 @@ void Filter::subset (const std::vector & input, std::vector & output std::vector ::const_iterator task; for (task = input.begin (); task != input.end (); ++task) { - bool oldFilter = e.evalFilter (*task); + // TODO Obsolete. + bool oldFilter = e9.evalFilter (*task); if (oldFilter) output.push_back (*task); @@ -111,6 +112,7 @@ void Filter::subset (const std::vector & input, std::vector & output Variant var; eval.evaluateCompiledExpression (var); + // TODO Obsolete filter comparison. if (oldFilter != var.get_bool ()) std::cout << "# filter mismatch ID " << task->id << " UUID " << task->get ("uuid") << "\n"; } @@ -161,6 +163,7 @@ void Filter::subset (std::vector & output) for (task = pending.begin (); task != pending.end (); ++task) { + // TODO Obsolete. bool oldFilter = e.evalFilter (*task); if (oldFilter) output.push_back (*task); @@ -170,6 +173,7 @@ void Filter::subset (std::vector & output) Variant var; eval.evaluateCompiledExpression (var); + // TODO Obsolete filter comparison. if (oldFilter != var.get_bool ()) std::cout << "# filter mismatch ID " << task->id << " UUID " << task->get ("uuid") << "\n"; } @@ -182,6 +186,7 @@ void Filter::subset (std::vector & output) for (task = completed.begin (); task != completed.end (); ++task) { + // TODO Obsolete. bool oldFilter = e.evalFilter (*task); if (oldFilter) output.push_back (*task); @@ -191,6 +196,7 @@ void Filter::subset (std::vector & output) Variant var; eval.evaluateCompiledExpression (var); + // TODO Obsolete filter comparison. if (oldFilter != var.get_bool ()) std::cout << "# filter mismatch ID " << task->id << " UUID " << task->get ("uuid") << "\n"; }