diff --git a/src/CLI.cpp b/src/CLI.cpp index 8c6fffc2a..8e465b595 100644 --- a/src/CLI.cpp +++ b/src/CLI.cpp @@ -1565,7 +1565,7 @@ void CLI::insertIDExpr () } } - // Combine the ID and UUID sections wiþh 'or'. + // Combine the ID and UUID sections with 'or'. if (_id_ranges.size () && _uuid_list.size ()) reconstructed.push_back (opOr); diff --git a/src/DOM.cpp b/src/DOM.cpp index eab6b214b..4d878c079 100644 --- a/src/DOM.cpp +++ b/src/DOM.cpp @@ -242,7 +242,7 @@ bool DOM::get (const std::string& name, const Task& task, Variant& value) { if (column->type () == "date") value = Variant (task.get_date (canonical), Variant::type_date); - else if (column->type () == "duration") + else if (column->type () == "duration" || canonical == "recur") value = Variant ((time_t) Duration (task.get (canonical)), Variant::type_duration); else if (column->type () == "numeric") value = Variant (task.get_float (canonical)); diff --git a/src/Filter.cpp b/src/Filter.cpp index 57b87df0c..1a1336dfd 100644 --- a/src/Filter.cpp +++ b/src/Filter.cpp @@ -85,7 +85,7 @@ void Filter::subset (const std::vector & input, std::vector & output // Debug output from Eval during compilation is useful. During evaluation // it is mostly noise. - eval.debug (context.config.getInteger ("debug.parser") >= 1 ? true : false); + eval.debug (context.config.getInteger ("debug.parser") >= 2 ? true : false); eval.compileExpression (filterExpr); eval.debug (false); @@ -147,7 +147,9 @@ void Filter::subset (std::vector & output) contextTask = *task; Variant var; + eval.debug (context.config.getInteger ("debug.parser") >= 2 ? true : false); eval.evaluateCompiledExpression (var); + eval.debug (false); if (var.get_bool ()) output.push_back (*task); } @@ -156,7 +158,7 @@ void Filter::subset (std::vector & output) if (! shortcut) { context.timer_filter.stop (); - const std::vector & completed = context.tdb2.completed.get_tasks (); // TODO Optional + const std::vector & completed = context.tdb2.completed.get_tasks (); context.timer_filter.start (); _startCount += (int) completed.size (); @@ -166,7 +168,9 @@ void Filter::subset (std::vector & output) contextTask = *task; Variant var; + eval.debug (context.config.getInteger ("debug.parser") >= 2 ? true : false); eval.evaluateCompiledExpression (var); + eval.debug (false); if (var.get_bool ()) output.push_back (*task); }