sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed bool controlling running total calculations

Browse source 
It used to be "account_wise", since it only happens for non-account-wise
reports.  Now it's called just "calc_running_total", so anyone can
request it.
This commit is contained in:
John Wiegley 2009-11-18 23:24:53 -05:00
parent 56d6df6123
commit ae8b57f157
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/chain.cc
View file

@ -95,7 +95,7 @@ post_handler_ptr chain_post_handlers(report_t& report,
// calc_posts computes the running total. When this appears will determine, // calc_posts computes the running total. When this appears will determine,
// for example, whether filtered posts are included or excluded from the // for example, whether filtered posts are included or excluded from the
// running total. // running total.
handler.reset(new calc_posts(handler, expr)); handler.reset(new calc_posts(handler, expr, ! for_accounts_report));
// filter_posts will only pass through posts matching the // filter_posts will only pass through posts matching the
// `secondary_predicate'. // `secondary_predicate'.

4
src/filters.cc
View file

@ -217,7 +217,7 @@ void calc_posts::operator()(post_t& post)
if (last_post) { if (last_post) {
assert(last_post->has_xdata()); assert(last_post->has_xdata());
if (! account_wise) if (calc_running_total)
xdata.total = last_post->xdata().total; xdata.total = last_post->xdata().total;
xdata.count = last_post->xdata().count + 1; xdata.count = last_post->xdata().count + 1;
} else { } else {
@ -230,7 +230,7 @@ void calc_posts::operator()(post_t& post)
account_t * acct = post.reported_account(); account_t * acct = post.reported_account();
acct->xdata().add_flags(ACCOUNT_EXT_VISITED); acct->xdata().add_flags(ACCOUNT_EXT_VISITED);
if (! account_wise) if (calc_running_total)
add_or_set_value(xdata.total, xdata.visited_value); add_or_set_value(xdata.total, xdata.visited_value);
item_handler<post_t>::operator()(post); item_handler<post_t>::operator()(post);

6
src/filters.h
View file

@ -280,16 +280,16 @@ class calc_posts : public item_handler<post_t>
{ {
post_t * last_post; post_t * last_post;
expr_t& amount_expr; expr_t& amount_expr;
bool account_wise; bool calc_running_total;
calc_posts(); calc_posts();
public: public:
calc_posts(post_handler_ptr handler, calc_posts(post_handler_ptr handler,
expr_t& _amount_expr, expr_t& _amount_expr,
bool _account_wise = false) bool _calc_running_total = false)
: item_handler<post_t>(handler), last_post(NULL), : item_handler<post_t>(handler), last_post(NULL),
amount_expr(_amount_expr), account_wise(_account_wise) { amount_expr(_amount_expr), calc_running_total(_calc_running_total) {
TRACE_CTOR(calc_posts, "post_handler_ptr, expr_t&, bool"); TRACE_CTOR(calc_posts, "post_handler_ptr, expr_t&, bool");
} }
virtual ~calc_posts() { virtual ~calc_posts() {