GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

CmdCustom

Browse source 
- Converted from A3 to Filter.
This commit is contained in:
Paul Beckingham 2014-05-24 14:58:13 -04:00
parent 3799b5dc9c
commit 410f4a3983
1 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/commands/CmdCustom.cpp
View file

@ -30,6 +30,7 @@
#include <vector> #include <vector>
#include <stdlib.h> #include <stdlib.h>
#include <Context.h> #include <Context.h>
#include <Filter.h>
#include <Lexer.h> #include <Lexer.h>
#include <ViewTask.h> #include <ViewTask.h>
#include <i18n.h> #include <i18n.h>
@ -88,6 +89,7 @@ int CmdCustom::execute (std::string& output)
std::vector <std::string>::reverse_iterator arg; std::vector <std::string>::reverse_iterator arg;
for (arg = filterArgs.rbegin (); arg != filterArgs.rend (); ++ arg) for (arg = filterArgs.rbegin (); arg != filterArgs.rend (); ++ arg)
{ {
// TODO Obsolete, but for now prevents 'operator mismatch' errors.
context.a3.capture_first (*arg); context.a3.capture_first (*arg);
Tree* t = context.a3t.captureFirst (*arg); Tree* t = context.a3t.captureFirst (*arg);
@ -95,15 +97,16 @@ int CmdCustom::execute (std::string& output)
t->tag ("FILTER"); t->tag ("FILTER");
} }
// TODO Obsolete, but for now prevents 'operator mismatch' errors..
context.a3t.parse (); context.a3t.parse ();
context.a3.categorize (); context.a3.categorize ();
context.a3.dump ("A3::categorize");
// Load the data. // Apply filter.
handleRecurrence (); handleRecurrence ();
Filter filter;
std::vector <Task> filtered; std::vector <Task> filtered;
filter (filtered); filter.subset (filtered);
context.tdb2.commit ();
// Sort the tasks. // Sort the tasks.
std::vector <int> sequence; std::vector <int> sequence;
@ -193,7 +196,6 @@ int CmdCustom::execute (std::string& output)
} }
feedback_backlog (); feedback_backlog ();
context.tdb2.commit ();
output = out.str (); output = out.str ();
return rc; return rc;
} }
@ -237,7 +239,7 @@ void CmdCustom::getLimits (const std::string& report, int& rows, int& lines)
// If the custom report has a defined limit, then allow a numeric override. // If the custom report has a defined limit, then allow a numeric override.
// This is an integer specified as a filter (limit:10). // This is an integer specified as a filter (limit:10).
std::string limit = context.a3.find_limit (); std::string limit = context.a3t.getLimit ();
if (limit != "") if (limit != "")
{ {
if (limit == "page") if (limit == "page")