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

*** empty log message ***

Browse source
This commit is contained in:
John Wiegley 2006-02-25 13:40:14 +00:00
parent f819ba6c10
commit e75bb1f71f
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.cc
View file

@ -69,10 +69,8 @@ int parse_and_report(int argc, char * argv[], char * envp[])
config.process_option("file", p); config.process_option("file", p);
if (const char * p = std::getenv("LEDGER_INIT")) if (const char * p = std::getenv("LEDGER_INIT"))
config.process_option("init-file", p); config.process_option("init-file", p);
#if 0
if (const char * p = std::getenv("PRICE_HIST")) if (const char * p = std::getenv("PRICE_HIST"))
config.process_option("price-db", p); config.process_option("price-db", p);
#endif
if (const char * p = std::getenv("PRICE_EXP")) if (const char * p = std::getenv("PRICE_EXP"))
config.process_option("price-exp", p); config.process_option("price-exp", p);
#endif #endif

4
valexpr.cc
View file

@ -348,6 +348,8 @@ void value_expr_t::compute(value_t& result, const details_t& details) const
if (right) { if (right) {
assert(right->kind == O_ARG); assert(right->kind == O_ARG);
switch (right->left->kind) { switch (right->left->kind) {
case F_NOW:
break; // already set to now
case DATE: case DATE:
if (details.xact && transaction_has_xdata(*details.xact) && if (details.xact && transaction_has_xdata(*details.xact) &&
transaction_xdata_(*details.xact).date) transaction_xdata_(*details.xact).date)
@ -377,6 +379,8 @@ void value_expr_t::compute(value_t& result, const details_t& details) const
std::time_t moment = terminus; std::time_t moment = terminus;
if (right) { if (right) {
switch (right->kind) { switch (right->kind) {
case F_NOW:
break; // already set to now
case DATE: case DATE:
if (details.xact && transaction_has_xdata(*details.xact) && if (details.xact && transaction_has_xdata(*details.xact) &&
transaction_xdata_(*details.xact).date) transaction_xdata_(*details.xact).date)