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

cleanup

Browse source
This commit is contained in:
John Wiegley 2004-08-11 23:24:49 -04:00
parent 0cf1d8fe69
commit c6f19a98d3
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
main.cc
View file

@ -590,18 +590,14 @@ int main(int argc, char * argv[])
if (command == "b") { if (command == "b") {
std::auto_ptr<item_handler<transaction_t> > formatter; std::auto_ptr<item_handler<transaction_t> > formatter;
formatter.reset(new add_to_account_value); formatter.reset(new add_to_account_value);
if (show_related) if (show_related)
formatter.reset(new related_transactions(formatter.release(), formatter.reset(new related_transactions(formatter.release(),
show_all_related)); show_all_related));
formatter.reset(new filter_transactions(formatter.release(), formatter.reset(new filter_transactions(formatter.release(), predicate));
predicate));
walk_entries(journal->entries, *formatter.get()); walk_entries(journal->entries, *formatter.get());
format_account acct_formatter(std::cout, format, display_predicate); format_account acct_formatter(std::cout, format, display_predicate);
if (show_subtotals) if (show_subtotals)
sum_accounts(journal->master); sum_accounts(journal->master);
walk_accounts(journal->master, acct_formatter, sort_order.get()); walk_accounts(journal->master, acct_formatter, sort_order.get());
@ -613,11 +609,12 @@ int main(int argc, char * argv[])
} }
} }
else if (command == "E") { else if (command == "E") {
add_to_account_value formatter; std::auto_ptr<item_handler<transaction_t> > formatter;
walk_entries(journal->entries, formatter); formatter.reset(new add_to_account_value);
formatter.reset(new filter_transactions(formatter.release(), predicate));
walk_entries(journal->entries, *formatter.get());
format_equity acct_formatter(std::cout, format, nformat, format_equity acct_formatter(std::cout, format, nformat, display_predicate);
display_predicate);
sum_accounts(journal->master); sum_accounts(journal->master);
walk_accounts(journal->master, acct_formatter, sort_order.get()); walk_accounts(journal->master, acct_formatter, sort_order.get());
} }
@ -693,12 +690,14 @@ int main(int argc, char * argv[])
// Once the filters are chained, walk `journal's entries and start // Once the filters are chained, walk `journal's entries and start
// feeding each transaction that matches `predicate' to the chain. // feeding each transaction that matches `predicate' to the chain.
walk_entries(journal->entries.begin(), journal->entries.end(), walk_entries(journal->entries, *formatter.get());
*formatter.get());
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
// The transaction display flags (dflags) are not recorded in the
// binary cache, and only need to be cleared if the transactions
// are to be displayed a second time.
clear_display_flags cleanup; clear_display_flags cleanup;
walk_entries(journal->entries.begin(), journal->entries.end(), cleanup); walk_entries(journal->entries, cleanup);
#endif #endif
} }