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

posts_commodities_iterator wasn't setting the journal

Browse source
This commit is contained in:
John Wiegley 2012-03-13 00:04:31 -05:00
parent 59cbcf703c
commit dcd83203e6
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/iterators.cc
View file

@ -76,16 +76,19 @@ void journal_posts_iterator::increment()
} }
namespace { namespace {
struct create_price_xact { struct create_price_xact
{
journal_t& journal;
account_t * account; account_t * account;
temporaries_t& temps; temporaries_t& temps;
xacts_list& xact_temps; xacts_list& xact_temps;
std::map<string, xact_t *> xacts_by_commodity; std::map<string, xact_t *> xacts_by_commodity;
create_price_xact(account_t * _account, temporaries_t& _temps, create_price_xact(journal_t& _journal, account_t * _account,
xacts_list& _xact_temps) temporaries_t& _temps, xacts_list& _xact_temps)
: account(_account), temps(_temps), xact_temps(_xact_temps) {} : journal(_journal), account(_account), temps(_temps),
xact_temps(_xact_temps) {}
void operator()(datetime_t& date, const amount_t& price) { void operator()(datetime_t& date, const amount_t& price) {
xact_t * xact; xact_t * xact;
@ -102,6 +105,7 @@ namespace {
xact->_date = date.date(); xact->_date = date.date();
xacts_by_commodity.insert xacts_by_commodity.insert
(std::pair<string, xact_t *>(symbol, xact)); (std::pair<string, xact_t *>(symbol, xact));
xact->journal = &journal;
} }
bool post_already_exists = false; bool post_already_exists = false;
@ -139,7 +143,7 @@ void posts_commodities_iterator::reset(journal_t& journal)
foreach (commodity_t * comm, commodities) foreach (commodity_t * comm, commodities)
comm->map_prices comm->map_prices
(create_price_xact(journal.master->find_account(comm->symbol()), (create_price_xact(journal, journal.master->find_account(comm->symbol()),
temps, xact_temps)); temps, xact_temps));
xacts.reset(xact_temps.begin(), xact_temps.end()); xacts.reset(xact_temps.begin(), xact_temps.end());