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

Restored all the old code, though not tested yet

Browse source
This commit is contained in:
John Wiegley 2009-03-16 00:09:33 -04:00
parent 585b3a246d
commit f2c60057ef
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/filters.cc
View file

@ -747,15 +747,16 @@ void budget_posts::report_budget_items(const date_t& date)
do { do {
reported = false; reported = false;
foreach (pending_posts_list::value_type& pair, pending_posts) { foreach (pending_posts_list::value_type& pair, pending_posts) {
#if 0 optional<date_t> begin = pair.first.start;
date_t& begin = pair.first.begin; if (! begin) {
if (! is_valid(begin)) { if (! pair.first.find_period(date))
pair.first.set_start(date); throw_(std::runtime_error, "Something odd has happened");
begin = pair.first.begin; begin = pair.first.start;
} }
assert(begin);
if (begin < date && if (*begin < date &&
(! is_valid(pair.first.end) || begin < pair.first.end)) { (! pair.first.end || *begin < *pair.first.end)) {
post_t& post = *pair.second; post_t& post = *pair.second;
DEBUG("ledger.walk.budget", "Reporting budget for " DEBUG("ledger.walk.budget", "Reporting budget for "
@ -773,13 +774,13 @@ void budget_posts::report_budget_items(const date_t& date)
temp.amount.in_place_negate(); temp.amount.in_place_negate();
xact.add_post(&temp); xact.add_post(&temp);
begin = pair.first.increment(begin); ++pair.first;
begin = *pair.first.start;
item_handler<post_t>::operator()(temp); item_handler<post_t>::operator()(temp);
reported = true; reported = true;
} }
#endif
} }
} while (reported); } while (reported);
} }
@ -818,15 +819,14 @@ void forecast_posts::add_post(const date_interval_t& period, post_t& post)
generate_posts::add_post(period, post); generate_posts::add_post(period, post);
date_interval_t& i = pending_posts.back().first; date_interval_t& i = pending_posts.back().first;
#if 0 if (! i.start) {
if (! is_valid(i.begin)) { if (! i.find_period(CURRENT_DATE()))
i.set_start(CURRENT_DATE()); throw_(std::runtime_error, "Something odd has happened");
i.begin = i.increment(i.begin); ++i;
} else { } else {
while (i.begin < CURRENT_DATE()) while (*i.start < CURRENT_DATE())
i.begin = i.increment(i.begin); ++i;
} }
#endif
} }
void forecast_posts::flush() void forecast_posts::flush()
@ -834,18 +834,17 @@ void forecast_posts::flush()
posts_list passed; posts_list passed;
date_t last; date_t last;
#if 0
while (pending_posts.size() > 0) { while (pending_posts.size() > 0) {
pending_posts_list::iterator least = pending_posts.begin(); pending_posts_list::iterator least = pending_posts.begin();
for (pending_posts_list::iterator i = ++pending_posts.begin(); for (pending_posts_list::iterator i = ++pending_posts.begin();
i != pending_posts.end(); i != pending_posts.end();
i++) i++)
if ((*i).first.begin < (*least).first.begin) if (*(*i).first.start < *(*least).first.start)
least = i; least = i;
date_t& begin = (*least).first.begin; date_t& begin = *(*least).first.start;
if (is_valid((*least).first.end) && begin >= (*least).first.end) { if ((*least).first.end && begin >= *(*least).first.end) {
pending_posts.erase(least); pending_posts.erase(least);
passed.remove((*least).second); passed.remove((*least).second);
continue; continue;
@ -864,7 +863,9 @@ void forecast_posts::flush()
temp.add_flags(ITEM_TEMP); temp.add_flags(ITEM_TEMP);
xact.add_post(&temp); xact.add_post(&temp);
date_t next = (*least).first.increment(begin); date_t next = *(*least).first.next;
++(*least).first;
if (next < begin || (is_valid(last) && (next - last).days() > 365 * 5)) if (next < begin || (is_valid(last) && (next - last).days() > 365 * 5))
break; break;
begin = next; begin = next;
@ -893,7 +894,6 @@ void forecast_posts::flush()
} }
} }
} }
#endif
item_handler<post_t>::flush(); item_handler<post_t>::flush();
} }