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

Re-enabled the --format (-F) option

Browse source
This commit is contained in:
John Wiegley 2009-02-15 21:08:36 -04:00
parent e861c312ac
commit 484b498c14
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/report.cc
View file

@ -512,22 +512,24 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
if (*(p + 1) == '\0' || is_eq(p, "bal") || is_eq(p, "balance")) if (*(p + 1) == '\0' || is_eq(p, "bal") || is_eq(p, "balance"))
return expr_t::op_t::wrap_functor return expr_t::op_t::wrap_functor
(reporter<account_t, acct_handler_ptr, &report_t::accounts_report> (reporter<account_t, acct_handler_ptr, &report_t::accounts_report>
(new format_accounts(*this, HANDLER(balance_format_).str()), (new format_accounts(*this, report_format(HANDLER(balance_format_))),
*this)); *this));
break; break;
case 'c': case 'c':
if (is_eq(p, "csv")) if (is_eq(p, "csv"))
return WRAP_FUNCTOR return WRAP_FUNCTOR
(reporter<>(new format_xacts(*this, HANDLER(csv_format_).str()), (reporter<>
*this)); (new format_xacts(*this, report_format(HANDLER(csv_format_))),
*this));
break; break;
case 'e': case 'e':
if (is_eq(p, "equity")) if (is_eq(p, "equity"))
return expr_t::op_t::wrap_functor return expr_t::op_t::wrap_functor
(reporter<account_t, acct_handler_ptr, &report_t::accounts_report> (reporter<account_t, acct_handler_ptr, &report_t::accounts_report>
(new format_equity(*this, HANDLER(print_format_).str()), *this)); (new format_equity(*this, report_format(HANDLER(print_format_))),
*this));
else if (is_eq(p, "entry")) else if (is_eq(p, "entry"))
return WRAP_FUNCTOR(entry_command); return WRAP_FUNCTOR(entry_command);
else if (is_eq(p, "emacs")) else if (is_eq(p, "emacs"))
@ -538,23 +540,27 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
case 'p': case 'p':
if (*(p + 1) == '\0' || is_eq(p, "print")) if (*(p + 1) == '\0' || is_eq(p, "print"))
return WRAP_FUNCTOR return WRAP_FUNCTOR
(reporter<>(new format_xacts(*this, HANDLER(print_format_).str()), (reporter<>
*this)); (new format_xacts(*this, report_format(HANDLER(print_format_))),
*this));
else if (is_eq(p, "prices")) else if (is_eq(p, "prices"))
return expr_t::op_t::wrap_functor return expr_t::op_t::wrap_functor
(reporter<xact_t, xact_handler_ptr, &report_t::commodities_report> (reporter<xact_t, xact_handler_ptr, &report_t::commodities_report>
(new format_xacts(*this, HANDLER(prices_format_).str()), *this)); (new format_xacts(*this, report_format(HANDLER(prices_format_))),
*this));
else if (is_eq(p, "pricesdb")) else if (is_eq(p, "pricesdb"))
return expr_t::op_t::wrap_functor return expr_t::op_t::wrap_functor
(reporter<xact_t, xact_handler_ptr, &report_t::commodities_report> (reporter<xact_t, xact_handler_ptr, &report_t::commodities_report>
(new format_xacts(*this, HANDLER(pricesdb_format_).str()), *this)); (new format_xacts(*this, report_format(HANDLER(pricesdb_format_))),
*this));
break; break;
case 'r': case 'r':
if (*(p + 1) == '\0' || is_eq(p, "reg") || is_eq(p, "register")) if (*(p + 1) == '\0' || is_eq(p, "reg") || is_eq(p, "register"))
return WRAP_FUNCTOR return WRAP_FUNCTOR
(reporter<>(new format_xacts(*this, HANDLER(register_format_).str()), (reporter<>
*this)); (new format_xacts(*this, report_format(HANDLER(register_format_))),
*this));
else if (is_eq(p, "reload")) else if (is_eq(p, "reload"))
return MAKE_FUNCTOR(report_t::reload_command); return MAKE_FUNCTOR(report_t::reload_command);
break; break;

6
src/report.h
View file

@ -146,6 +146,12 @@ public:
return value_t(static_cast<scope_t *>(this)); return value_t(static_cast<scope_t *>(this));
} }
string report_format(option_t<report_t>& option) {
if (HANDLED(format_))
return HANDLER(format_).str();
return option.str();
}
value_t reload_command(call_scope_t& scope) { value_t reload_command(call_scope_t& scope) {
session.close_journal_files(); session.close_journal_files();
session.read_journal_files(); session.read_journal_files();