[Gnucash-changes] r13723 - gnucash/trunk - Mike Alexander's patch to get currency quote retrieval working again,

[David Hampton]

Author: hampton
Date: 2006-04-01 00:45:07 -0500 (Sat, 01 Apr 2006)
New Revision: 13723
Trac: http://svn.gnucash.org/trac/changeset/13723

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/backend/file/gnc-account-xml-v2.c
   gnucash/trunk/src/engine/Account.c
   gnucash/trunk/src/engine/engine-utilities.scm
   gnucash/trunk/src/engine/gnc-commodity.c
   gnucash/trunk/src/scm/price-quotes.scm
Log:
Mike Alexander's patch to get currency quote retrieval working again,
and some other small currency quote bugfixes.  Closes 333572.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-04-01 05:28:52 UTC (rev 13722)
+++ gnucash/trunk/ChangeLog	2006-04-01 05:45:07 UTC (rev 13723)
@@ -1,3 +1,13 @@
+2006-04-01  David Hampton  <hampton at employees.org>
+
+	* src/backend/file/gnc-account-xml-v2.c:
+	* src/scm/price-quotes.scm:
+	* src/engine/Account.c:
+	* src/engine/engine-utilities.scm:
+	* src/engine/gnc-commodity.c: Mike Alexander's patch to get
+	currency quote retrieval working again, and some other small
+	currency quote bugfixes.  Closes 333572.
+
 2006-03-31  David Hampton  <hampton at employees.org>
 
 	* src/engine/Transaction.c: Restore sorting transactions by date

Modified: gnucash/trunk/src/backend/file/gnc-account-xml-v2.c
===================================================================
--- gnucash/trunk/src/backend/file/gnc-account-xml-v2.c	2006-04-01 05:28:52 UTC (rev 13722)
+++ gnucash/trunk/src/backend/file/gnc-account-xml-v2.c	2006-04-01 05:45:07 UTC (rev 13723)
@@ -129,7 +129,7 @@
 
 	  com = xaccAccountGetCommodity(act);
 	  if (com &&
-	      !gnc_commodity_is_iso(com) &&
+	      (!gnc_commodity_is_iso(com) || xaccAccountGetType(act) == CURRENCY) &&
 	      gnc_commodity_get_quote_flag(com)) {
 	    if (!kvpnode)
 	      kvpnode= xmlNewNode(NULL, BAD_CAST act_slots_string);

Modified: gnucash/trunk/src/engine/Account.c
===================================================================
--- gnucash/trunk/src/engine/Account.c	2006-04-01 05:28:52 UTC (rev 13722)
+++ gnucash/trunk/src/engine/Account.c	2006-04-01 05:45:07 UTC (rev 13723)
@@ -1140,6 +1140,8 @@
     /* compatability hack - Gnucash 1.8 gets currency quotes when a
        non-default currency is assigned to an account.  */
     gnc_commodity_set_quote_flag(com, TRUE);
+    gnc_commodity_set_quote_source(com, 
+        gnc_commodity_get_default_quote_source(com));
   }
   xaccAccountCommitEdit(acc);
 }

Modified: gnucash/trunk/src/engine/engine-utilities.scm
===================================================================
--- gnucash/trunk/src/engine/engine-utilities.scm	2006-04-01 05:28:52 UTC (rev 13722)
+++ gnucash/trunk/src/engine/engine-utilities.scm	2006-04-01 05:45:07 UTC (rev 13723)
@@ -21,14 +21,13 @@
 
 ;; Copyright 2000 Rob Browning <rlb at cs.utexas.edu>
 
-(define (gnc:url->loaded-session url ignore-lock? create-if-needed?)
+(define (gnc:url->loaded-session session url ignore-lock? create-if-needed?)
   ;; Return a <gnc:Book*> representing the data stored at the given
   ;; url or #f on failure -- this should later be changed to returning
   ;; the symbol representing the book error...  On success, the book
   ;; will already be loaded.
 
-  (let* ((session (gnc:session-new))
-         (result (and session
+  (let* ((result (and session
                       (gnc:session-begin session url
                                          ignore-lock?
                                          create-if-needed?)

Modified: gnucash/trunk/src/engine/gnc-commodity.c
===================================================================
--- gnucash/trunk/src/engine/gnc-commodity.c	2006-04-01 05:28:52 UTC (rev 13722)
+++ gnucash/trunk/src/engine/gnc-commodity.c	2006-04-01 05:45:07 UTC (rev 13723)
@@ -108,7 +108,7 @@
 };
 
 static gnc_quote_source currency_quote_source =
-  { TRUE, 0, 0, "CURRENCY", "currency", "currency" };
+  { TRUE, 0, 0, "Currency", "CURRENCY", "currency" };
 
 static gnc_quote_source single_quote_sources[] = {
   { FALSE, 0, 0, "AEX", "AEX", "aex" },

Modified: gnucash/trunk/src/scm/price-quotes.scm
===================================================================
--- gnucash/trunk/src/scm/price-quotes.scm	2006-04-01 05:28:52 UTC (rev 13722)
+++ gnucash/trunk/src/scm/price-quotes.scm	2006-04-01 05:45:07 UTC (rev 13723)
@@ -738,7 +738,7 @@
                                    prices)))))))
 
 (define (gnc:add-quotes-to-book-at-url url)
-  (let* ((session (gnc:url->loaded-session url #f #f))
+  (let* ((session (gnc:url->loaded-session (gnc:get-current-session) url #f #f))
          (quote-ok? #f))
     (gnc:debug "in add-quotes-to-book-at-url")
     (if session