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

*** empty log message ***

Browse source
This commit is contained in:
John Wiegley 2006-03-04 18:09:13 +00:00
parent 3c0caf1100
commit 326235ffbe
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
amount.cc
View file

@ -1478,8 +1478,9 @@ commodity_t * commodity_t::find_or_create(const std::string& symbol)
DEBUG_PRINT("amounts.commodities", "Find-or-create commodity " << symbol); DEBUG_PRINT("amounts.commodities", "Find-or-create commodity " << symbol);
commodity_t * commodity = find(symbol); commodity_t * commodity = find(symbol);
if (! commodity) if (commodity)
return create(symbol); return commodity;
return create(symbol);
} }
commodity_t * commodity_t::find(const std::string& symbol) commodity_t * commodity_t::find(const std::string& symbol)
@ -1631,6 +1632,7 @@ annotated_commodity_t::create(const std::string& symbol,
{ {
commodity_t * comm = commodity_t::find_or_create(symbol); commodity_t * comm = commodity_t::find_or_create(symbol);
assert(comm); assert(comm);
if (! price && ! date && tag.empty()) if (! price && ! date && tag.empty())
return comm; return comm;
@ -1668,7 +1670,9 @@ annotated_commodity_t::find_or_create(const commodity_t& comm,
commodity_t * base = commodity_t::find(name); commodity_t * base = commodity_t::find(name);
if (base) if (base)
return base; return base;
base = commodity_t::find_or_create(comm.base_symbol()); base = commodity_t::find_or_create(comm.base_symbol());
assert(base);
return create(*base, price, date, tag, name); return create(*base, price, date, tag, name);
} }