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

Moved the setting of time quantities to the commodity initialization

Browse source 
section.
This commit is contained in:
John Wiegley 2005-07-25 20:57:28 +00:00
parent 312f0c27e3
commit d65a758c84
2 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
amount.cc
View file

@ -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() {

20
config.cc
View file

@ -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) {