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

Renamed escape to quoted, and fixed up the csv report.

Browse source
This commit is contained in:
John Wiegley 2009-02-07 05:53:22 -04:00
parent ea9330adae
commit df6b02b3ef
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/report.cc
View file

@ -80,14 +80,14 @@ report_t::report_t(session_t& _session) : session(_session)
HANDLER(pricesdb_format_).on("P %[%Y/%m/%d %H:%M:%S] %A %t\n");
HANDLER(csv_format_).on(
"%(escape(display_date)),"
"%(escape(payee)),"
"%(escape(account)),"
"%(escape(display_amount)),"
"%(escape(display_total)),"
"%(escape(cleared ? \"*\" : (uncleared ? \"\" : \"!\"))),"
"%(escape(code),"
"%(squash(escape(note))\n");
"%(quoted(display_date)),"
"%(quoted(payee)),"
"%(quoted(account)),"
"%(quoted(display_amount)),"
"%(quoted(display_total)),"
"%(quoted(cleared ? \"*\" : (uncleared ? \"\" : \"!\"))),"
"%(quoted(code)),"
"%(quoted(join(note)))\n");
}
void report_t::xacts_report(xact_handler_ptr handler)
@ -229,7 +229,7 @@ value_t report_t::fn_truncate(call_scope_t& args)
account_abbrev ? *account_abbrev : -1));
}
value_t report_t::fn_escape(call_scope_t& args)
value_t report_t::fn_quoted(call_scope_t& args)
{
std::ostringstream out;
@ -568,11 +568,6 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
return MAKE_FUNCTOR(report_t::fn_display_total);
break;
case 'e':
if (is_eq(p, "escape"))
return MAKE_FUNCTOR(report_t::fn_escape);
break;
case 'j':
if (is_eq(p, "join"))
return MAKE_FUNCTOR(report_t::fn_join);
@ -620,6 +615,11 @@ expr_t::ptr_op_t report_t::lookup(const string& name)
return MAKE_FUNCTOR(report_t::fn_print_balance);
break;
case 'q':
if (is_eq(p, "quoted"))
return MAKE_FUNCTOR(report_t::fn_quoted);
break;
case 's':
if (is_eq(p, "strip"))
return MAKE_FUNCTOR(report_t::fn_strip);

2
src/report.h
View file

@ -129,7 +129,7 @@ public:
value_t fn_print_balance(call_scope_t& scope);
value_t fn_strip(call_scope_t& scope);
value_t fn_truncate(call_scope_t& scope);
value_t fn_escape(call_scope_t& scope);
value_t fn_quoted(call_scope_t& scope);
value_t fn_join(call_scope_t& scope);
value_t fn_options(call_scope_t& scope) {