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

fn_market can now accept a commodity name for arg 0

Browse source
This commit is contained in:
John Wiegley 2012-03-08 01:08:08 -06:00
parent 113fb0ee6a
commit 9f81c798ee
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/report.cc
View file

@ -517,11 +517,21 @@ value_t report_t::fn_market(call_scope_t& args)
args.get<datetime_t>(1) : args.get<datetime_t>(1) :
optional<datetime_t>()); optional<datetime_t>());
value_t result; value_t result;
value_t arg0 = args[0];
if (arg0.is_string()) {
amount_t tmp(1L);
commodity_t * commodity =
commodity_pool_t::current_pool->find_or_create(arg0.as_string());
tmp.set_commodity(*commodity);
arg0 = tmp;
}
if (args.has<string>(2)) if (args.has<string>(2))
result = args[0].exchange_commodities(args.get<string>(2), result = arg0.exchange_commodities(args.get<string>(2),
/* add_prices= */ false, moment); /* add_prices= */ false, moment);
else else
result = args[0].value(moment); result = arg0.value(moment);
if (! result.is_null()) if (! result.is_null())
return result; return result;