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

fixes to quote downloading

Browse source
This commit is contained in:
John Wiegley 2004-08-19 03:01:24 -04:00
parent f62a4906d1
commit 61cc6c5a9a
4 changed files with 45 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
amount.cc
View file

@ -892,9 +892,6 @@ amount_t commodity_t::value(const std::time_t moment)
std::time_t age = 0; std::time_t age = 0;
amount_t price; amount_t price;
if (updater)
(*updater)(this, age, price, moment);
for (history_map::reverse_iterator i = history.rbegin(); for (history_map::reverse_iterator i = history.rbegin();
i != history.rend(); i != history.rend();
i++) i++)
@ -904,6 +901,9 @@ amount_t commodity_t::value(const std::time_t moment)
break; break;
} }
if (updater)
(*updater)(this, moment, age, price);
return price; return price;
} }

4
amount.h
View file

@ -201,9 +201,9 @@ class commodity_t
public: public:
virtual ~updater_t() {} virtual ~updater_t() {}
virtual void operator()(commodity_t * commodity, virtual void operator()(commodity_t * commodity,
const std::time_t moment,
const std::time_t date, const std::time_t date,
const amount_t& price, amount_t& price) = 0;
const std::time_t moment) = 0;
}; };
typedef unsigned long ident_t; typedef unsigned long ident_t;

69
quotes.cc
View file

@ -6,47 +6,54 @@
namespace ledger { namespace ledger {
void quotes_by_script::operator()(commodity_t * commodity, void quotes_by_script::operator()(commodity_t * commodity,
const std::time_t moment,
const std::time_t date, const std::time_t date,
const amount_t& price, amount_t& price)
const std::time_t moment)
{ {
if (! (commodity->flags & COMMODITY_STYLE_CONSULTED) && if (commodity->flags & COMMODITY_STYLE_CONSULTED ||
std::difftime(now, moment) < pricing_leeway && std::difftime(moment, now) < pricing_leeway ||
(! price || std::difftime(moment, date) > pricing_leeway)) { (price && std::difftime(moment, date) <= pricing_leeway))
using namespace std; return;
// Only consult the Internet once for any commodity using namespace std;
commodity->flags |= COMMODITY_STYLE_CONSULTED;
cache_dirty = true;
char buf[256]; DEBUG_PRINT("ledger.quotes.download",
buf[0] = '\0'; "downloading quote for symbol " << commodity->symbol);
DEBUG_PRINT("ledger.quotes.download",
"pricing_leeway is " << pricing_leeway);
DEBUG_PRINT_TIME("ledger.quotes.download", now);
DEBUG_PRINT_TIME("ledger.quotes.download", moment);
DEBUG_PRINT_TIME("ledger.quotes.download", date);
if (FILE * fp = popen((string("getquote ") + // Only consult the Internet once for any commodity
commodity->symbol).c_str(), "r")) { commodity->flags |= COMMODITY_STYLE_CONSULTED;
if (feof(fp) || ! fgets(buf, 255, fp)) { cache_dirty = true;
fclose(fp);
return; char buf[256];
} buf[0] = '\0';
if (FILE * fp = popen((string("getquote ") +
commodity->symbol).c_str(), "r")) {
if (feof(fp) || ! fgets(buf, 255, fp)) {
fclose(fp); fclose(fp);
return;
} }
fclose(fp);
}
if (buf[0]) { if (buf[0]) {
char * p = strchr(buf, '\n'); char * p = strchr(buf, '\n');
if (p) *p = '\0'; if (p) *p = '\0';
amount_t current; price.parse(buf);
current.parse(buf); commodity->add_price(now, price);
commodity->add_price(now, current); if (! price_db.empty()) {
char buf[128];
if (! price_db.empty()) { strftime(buf, 127, "%Y/%m/%d %H:%M:%S", localtime(&now));
char buf[128]; ofstream database(price_db.c_str(), ios_base::out | ios_base::app);
strftime(buf, 127, "%Y/%m/%d %H:%M:%S", localtime(&now)); database << "P " << buf << " " << commodity->symbol
ofstream database(price_db.c_str(), ios_base::out | ios_base::app); << " " << price << endl;
database << "P " << buf << " " << commodity->symbol << " "
<< current << endl;
}
} }
} }
} }

4
quotes.h
View file

@ -19,9 +19,9 @@ class quotes_by_script : public commodity_t::updater_t
cache_dirty(_cache_dirty) {} cache_dirty(_cache_dirty) {}
virtual void operator()(commodity_t * commodity, virtual void operator()(commodity_t * commodity,
const std::time_t moment,
const std::time_t date, const std::time_t date,
const amount_t& price, amount_t& price);
const std::time_t moment);
}; };
} // namespace ledger } // namespace ledger