From aa4cb6c37182dd2821fc6ba52cde70e05f7c7e34 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 19 Oct 2005 23:26:40 +0000 Subject: When computing a report period, use the direct results of the parse rather than passing back to --begin and --end. --- config.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'config.cc') diff --git a/config.cc b/config.cc index 7dfcc2fc..a7afd152 100644 --- a/config.cc +++ b/config.cc @@ -796,11 +796,21 @@ OPT_BEGIN(period, "p:") { interval_t interval(config.report_period); if (interval.begin) { std::strftime(buf, 127, formats[0], std::localtime(&interval.begin)); - process_option(config_options, "begin", buf); + + if (! config.predicate.empty()) + config.predicate += "&"; + config.predicate += "d>=["; + config.predicate += buf; + config.predicate += "]"; } if (interval.end) { std::strftime(buf, 127, formats[0], std::localtime(&interval.end)); - process_option(config_options, "end", buf); + + if (! config.predicate.empty()) + config.predicate += "&"; + config.predicate += "d<["; + config.predicate += buf; + config.predicate += "]"; } } OPT_END(period); @@ -893,10 +903,12 @@ OPT_BEGIN(amount_data, "j") { config.format_string = config.plot_amount_format; } OPT_END(amount_data); + OPT_BEGIN(total_data, "J") { config.format_string = config.plot_total_format; } OPT_END(total_data); + ////////////////////////////////////////////////////////////////////// // // Commodity reporting -- cgit v1.2.3