From d65a758c8428403ece6548955a206a4b18a577b2 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 25 Jul 2005 20:57:28 +0000 Subject: [PATCH] Moved the setting of time quantities to the commodity initialization section. --- amount.cc | 20 ++++++++++++++++++++ config.cc | 20 -------------------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/amount.cc b/amount.cc index 0af18a7b..933716c6 100644 --- a/amount.cc +++ b/amount.cc @@ -60,6 +60,26 @@ static struct _init_amounts { commodity_t::updater = NULL; commodity_t::null_commodity = commodity_t::find_commodity("", true); commodity_t::default_commodity = NULL; + + // Add time commodity conversions, so that timelog's may be parsed + // in terms of seconds, but reported as minutes or hours. + commodity_t * commodity; + + commodity = commodity_t::find_commodity("s", true); + commodity->flags |= COMMODITY_STYLE_NOMARKET; + + parse_conversion("1.0m", "60s"); + parse_conversion("1.0h", "60m"); + +#if 0 + commodity = commodity_t::find_commodity("b", true); + commodity->flags |= COMMODITY_STYLE_NOMARKET; + + parse_conversion("1.00 Kb", "1024 b"); + parse_conversion("1.00 Mb", "1024 Kb"); + parse_conversion("1.00 Gb", "1024 Mb"); + parse_conversion("1.00 Tb", "1024 Gb"); +#endif } ~_init_amounts() { diff --git a/config.cc b/config.cc index 7e1a82ea..7d82ab83 100644 --- a/config.cc +++ b/config.cc @@ -297,26 +297,6 @@ void parse_ledger_data(journal_t * journal, parser_t * cache_parser, if (! config.account.empty()) account = journal->find_account(config.account); - // Add time commodity conversions, so that timelog's may be parsed - // in terms of seconds, but reported as minutes or hours. - commodity_t * commodity; - - commodity = commodity_t::find_commodity("s", true); - commodity->flags |= COMMODITY_STYLE_NOMARKET; - - parse_conversion("1.0m", "60s"); - parse_conversion("1.0h", "60m"); - -#if 0 - commodity = commodity_t::find_commodity("b", true); - commodity->flags |= COMMODITY_STYLE_NOMARKET; - - parse_conversion("1.00 Kb", "1024 b"); - parse_conversion("1.00 Mb", "1024 Kb"); - parse_conversion("1.00 Gb", "1024 Mb"); - parse_conversion("1.00 Tb", "1024 Gb"); -#endif - journal->price_db = config.price_db; if (! journal->price_db.empty() && access(journal->price_db.c_str(), R_OK) != -1) {