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

Restored the -j and -J options

Browse source
This commit is contained in:
John Wiegley 2009-02-19 13:40:48 -04:00
parent b684783eff
commit 1f1a83c083
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/report.cc
View file

@ -143,6 +143,11 @@ value_t report_t::fn_strip(call_scope_t& args)
return args[0].strip_annotations(what_to_keep()); return args[0].strip_annotations(what_to_keep());
} }
value_t report_t::fn_quantity(call_scope_t& args)
{
return args[0].to_amount().number();
}
value_t report_t::fn_truncate(call_scope_t& args) value_t report_t::fn_truncate(call_scope_t& args)
{ {
var_t<long> width(args, 1); var_t<long> width(args, 1);
@ -602,6 +607,8 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
case 'q': case 'q':
if (is_eq(p, "quoted")) if (is_eq(p, "quoted"))
return MAKE_FUNCTOR(report_t::fn_quoted); return MAKE_FUNCTOR(report_t::fn_quoted);
else if (is_eq(p, "quantity"))
return MAKE_FUNCTOR(report_t::fn_quantity);
break; break;
case 's': case 's':

17
src/report.h
View file

@ -134,6 +134,7 @@ public:
value_t fn_display_total(call_scope_t& scope); value_t fn_display_total(call_scope_t& scope);
value_t fn_market_value(call_scope_t& scope); value_t fn_market_value(call_scope_t& scope);
value_t fn_strip(call_scope_t& scope); value_t fn_strip(call_scope_t& scope);
value_t fn_quantity(call_scope_t& scope);
value_t fn_truncate(call_scope_t& scope); value_t fn_truncate(call_scope_t& scope);
value_t fn_print(call_scope_t& scope); value_t fn_print(call_scope_t& scope);
value_t fn_quoted(call_scope_t& scope); value_t fn_quoted(call_scope_t& scope);
@ -204,11 +205,9 @@ public:
set_expr(args[0].to_string()); set_expr(args[0].to_string());
}); });
OPTION_(report_t, amount_data, DO() { OPTION_(report_t, amount_data, DO() { // -j
#if 0 parent->HANDLER(format_).on(parent->HANDLER(plot_amount_format_).str());
format_string = session.plot_amount_format; });
#endif
}); // -j
OPTION(report_t, anon); OPTION(report_t, anon);
OPTION(report_t, ansi); OPTION(report_t, ansi);
@ -536,11 +535,9 @@ public:
set_expr(args[0].to_string()); set_expr(args[0].to_string());
}); });
OPTION_(report_t, total_data, DO() { OPTION_(report_t, total_data, DO() { // -J
#if 0 parent->HANDLER(format_).on(parent->HANDLER(plot_total_format_).str());
format_string = session.plot_total_format; });
#endif
}); // -J
OPTION(report_t, totals); OPTION(report_t, totals);