4 files changed, 48 insertions, 41 deletions

diff --git a/amount.cc b/amount.cc
index d8e5a85d..6802ce15 100644
--- a/amount.cc
+++ b/amount.cc
@@ -892,9 +892,6 @@ amount_t commodity_t::value(const std::time_t moment)
   std::time_t age = 0;
   amount_t    price;
 
-  if (updater)
-    (*updater)(this, age, price, moment);
-
   for (history_map::reverse_iterator i = history.rbegin();
        i != history.rend();
        i++)
@@ -904,6 +901,9 @@ amount_t commodity_t::value(const std::time_t moment)
       break;
     }
 
+  if (updater)
+    (*updater)(this, moment, age, price);
+
   return price;
 }
 
diff --git a/amount.h b/amount.h
index c94b5dc1..040c3ff3 100644
--- a/amount.h
+++ b/amount.h
@@ -201,9 +201,9 @@ class commodity_t
    public:
     virtual ~updater_t() {}
     virtual void operator()(commodity_t *     commodity,
+			    const std::time_t moment,
 			    const std::time_t date,
-			    const amount_t&   price,
-			    const std::time_t moment) = 0;
+			    amount_t&         price) = 0;
   };
 
   typedef unsigned long ident_t;
diff --git a/quotes.cc b/quotes.cc
index 0bc5779b..986bfa84 100644
--- a/quotes.cc
+++ b/quotes.cc
@@ -6,47 +6,54 @@
 namespace ledger {
 
 void quotes_by_script::operator()(commodity_t *     commodity,
+				  const std::time_t moment,
 				  const std::time_t date,
-				  const amount_t&   price,
-				  const std::time_t moment)
+				  amount_t&	    price)
 {
-  if (! (commodity->flags & COMMODITY_STYLE_CONSULTED) &&
-      std::difftime(now, moment) < pricing_leeway &&
-      (! price || std::difftime(moment, date) > pricing_leeway)) {
-    using namespace std;
-
-    // Only consult the Internet once for any commodity
-    commodity->flags |= COMMODITY_STYLE_CONSULTED;
-    cache_dirty = true;
-
-    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);
-	return;
-      }
+  if (commodity->flags & COMMODITY_STYLE_CONSULTED ||
+      std::difftime(moment, now) < pricing_leeway ||
+      (price && std::difftime(moment, date) <= pricing_leeway))
+    return;
+
+  using namespace std;
+
+  DEBUG_PRINT("ledger.quotes.download",
+	      "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);
+
+  // Only consult the Internet once for any commodity
+  commodity->flags |= COMMODITY_STYLE_CONSULTED;
+  cache_dirty = true;
+
+  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);
+      return;
     }
+    fclose(fp);
+  }
 
-    if (buf[0]) {
-      char * p = strchr(buf, '\n');
-      if (p) *p = '\0';
-
-      amount_t current;
-      current.parse(buf);
+  if (buf[0]) {
+    char * p = strchr(buf, '\n');
+    if (p) *p = '\0';
 
-      commodity->add_price(now, current);
+    price.parse(buf);
+    commodity->add_price(now, price);
 
-      if (! price_db.empty()) {
-	char buf[128];
-	strftime(buf, 127, "%Y/%m/%d %H:%M:%S", localtime(&now));
-	ofstream database(price_db.c_str(), ios_base::out | ios_base::app);
-	database << "P " << buf << " " << commodity->symbol << " "
-		 << current << endl;
-      }
+    if (! price_db.empty()) {
+      char buf[128];
+      strftime(buf, 127, "%Y/%m/%d %H:%M:%S", localtime(&now));
+      ofstream database(price_db.c_str(), ios_base::out | ios_base::app);
+      database << "P " << buf << " " << commodity->symbol
+	       << " " << price << endl;
     }
   }
 }
diff --git a/quotes.h b/quotes.h
index 8faa601a..a6e05cb1 100644
--- a/quotes.h
+++ b/quotes.h
@@ -19,9 +19,9 @@ class quotes_by_script : public commodity_t::updater_t
       cache_dirty(_cache_dirty) {}
 
   virtual void operator()(commodity_t *     commodity,
+			  const std::time_t moment,
 			  const std::time_t date,
-			  const amount_t&   price,
-			  const std::time_t moment);
+			  amount_t&	    price);
 };
 
 } // namespace ledger