diff options
| author | John Wiegley <johnw@newartisans.com> | 2009-11-18 05:45:48 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2009-11-18 05:45:48 -0500 |
| commit | e4b3f0bb3a74b799f0f67d8b2f1efeedad5e2021 (patch) | |
| tree | 605879730937c258e41090302bff105c6d0a96a1 /src/report.cc | |
| parent | 7fe369eb492f737f570d0ccf4aaf5db68f900279 (diff) | |
| download | ledger-e4b3f0bb3a74b799f0f67d8b2f1efeedad5e2021.tar.gz ledger-e4b3f0bb3a74b799f0f67d8b2f1efeedad5e2021.tar.bz2 ledger-e4b3f0bb3a74b799f0f67d8b2f1efeedad5e2021.zip | |
The new period parser is passing all tests
Diffstat (limited to 'src/report.cc')
| -rw-r--r-- | src/report.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/report.cc b/src/report.cc index efe162e2..78ed05c0 100644 --- a/src/report.cc +++ b/src/report.cc @@ -120,14 +120,15 @@ void report_t::normalize_options(const string& verb) date_interval_t interval(HANDLER(period_).str()); - if (! HANDLED(begin_) && interval.start) { - string predicate = - "date>=[" + to_iso_extended_string(*interval.start) + "]"; + optional<date_t> begin = interval.begin(session.current_year); + optional<date_t> end = interval.end(session.current_year); + + if (! HANDLED(begin_) && begin) { + string predicate = "date>=[" + to_iso_extended_string(*begin) + "]"; HANDLER(limit_).on(string("?normalize"), predicate); } - if (! HANDLED(end_) && interval.finish) { - string predicate = - "date<[" + to_iso_extended_string(*interval.finish) + "]"; + if (! HANDLED(end_) && end) { + string predicate = "date<[" + to_iso_extended_string(*end) + "]"; HANDLER(limit_).on(string("?normalize"), predicate); } |