more fixes

This commit is contained in:
John Wiegley 2004-08-09 17:38:05 -04:00
parent 05b2cc46fd
commit 6e6246c927
2 changed files with 10 additions and 4 deletions

View file

@ -208,6 +208,11 @@ class format_account
const item_predicate<account_t>&
disp_pred_functor,
const account_t *& to_show);
static bool disp_subaccounts_p(const account_t * account) {
const account_t * temp;
return disp_subaccounts_p(account, item_predicate<account_t>(NULL), temp);
}
static bool display_account(const account_t * account,
const item_predicate<account_t>&
disp_pred_functor);

View file

@ -651,10 +651,11 @@ int main(int argc, char * argv[])
walk_accounts(journal->master, formatter, predicate.get(),
xact_display_flags, show_subtotals, sort_order.get());
std::string end_format = "--------------------\n";
format.reset(end_format + f);
format_account(std::cout, format,
display_predicate.get())(journal->master);
if (format_account::disp_subaccounts_p(journal->master)) {
std::string end_format = "--------------------\n";
format.reset(end_format + f);
format.format_elements(std::cout, details_t(journal->master));
}
}
else if (command == "E") {
format_t format(first_line_format);