[Gnucash-changes] r13652 - gnucash/trunk/src - Collapse duplicated code into a single function.

[David Hampton]

Author: hampton
Date: 2006-03-16 23:25:24 -0500 (Thu, 16 Mar 2006)
New Revision: 13652
Trac: http://svn.gnucash.org/trac/changeset/13652

Modified:
   gnucash/trunk/src/engine/Account.c
   gnucash/trunk/src/engine/Account.h
   gnucash/trunk/src/engine/Recurrence.c
   gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c
Log:
Collapse duplicated code into a single function.


Modified: gnucash/trunk/src/engine/Account.c
===================================================================
--- gnucash/trunk/src/engine/Account.c	2006-03-16 22:47:30 UTC (rev 13651)
+++ gnucash/trunk/src/engine/Account.c	2006-03-17 04:25:24 UTC (rev 13652)
@@ -1768,6 +1768,17 @@
         include_children);
 }
 
+gnc_numeric
+xaccAccountGetBalanceChangeForPeriod (Account *acc, time_t t1, time_t t2, gboolean recurse)
+{
+  gnc_numeric b1, b2;  
+
+  b1 = xaccAccountGetBalanceAsOfDateInCurrency(acc, t1, NULL, recurse);
+  b2 = xaccAccountGetBalanceAsOfDateInCurrency(acc, t2, NULL, recurse);
+  return gnc_numeric_sub(b2, b1, GNC_DENOM_AUTO, GNC_HOW_DENOM_FIXED);
+}
+
+
 /********************************************************************\
 \********************************************************************/
 

Modified: gnucash/trunk/src/engine/Account.h
===================================================================
--- gnucash/trunk/src/engine/Account.h	2006-03-16 22:47:30 UTC (rev 13651)
+++ gnucash/trunk/src/engine/Account.h	2006-03-17 04:25:24 UTC (rev 13652)
@@ -407,6 +407,10 @@
 gnc_numeric xaccAccountGetBalanceAsOfDateInCurrency(
     Account *account, time_t date, gnc_commodity *report_commodity,
     gboolean include_children);
+
+gnc_numeric xaccAccountGetBalanceChangeForPeriod (
+    Account *acc, time_t date1, time_t date2, gboolean recurse);
+
 /** @} */
 
 /** @name Account Children and Parents. 

Modified: gnucash/trunk/src/engine/Recurrence.c
===================================================================
--- gnucash/trunk/src/engine/Recurrence.c	2006-03-16 22:47:30 UTC (rev 13651)
+++ gnucash/trunk/src/engine/Recurrence.c	2006-03-17 04:25:24 UTC (rev 13652)
@@ -246,18 +246,13 @@
 gnc_numeric
 recurrenceGetAccountPeriodValue(const Recurrence *r, Account *acc, guint n)
 {
-    gnc_numeric num1, num2;
     time_t t1, t2;
 
     // FIXME: maybe zero is not best error return val.
     g_return_val_if_fail(r && acc, gnc_numeric_zero());
     t1 = recurrenceGetPeriodTime(r, n, FALSE);
     t2 = recurrenceGetPeriodTime(r, n, TRUE);
-
-    num1 = xaccAccountGetBalanceAsOfDateInCurrency(acc, t1, NULL, TRUE);
-    num2 = xaccAccountGetBalanceAsOfDateInCurrency(acc, t2, NULL, TRUE);
-
-    return gnc_numeric_sub(num2, num1, GNC_DENOM_AUTO, GNC_HOW_DENOM_FIXED);
+    return xaccAccountGetBalanceChangeForPeriod (acc, t1, t2, TRUE);
 }
 
 void

Modified: gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c	2006-03-16 22:47:30 UTC (rev 13651)
+++ gnucash/trunk/src/gnome-utils/gnc-tree-model-account.c	2006-03-17 04:25:24 UTC (rev 13652)
@@ -605,7 +605,7 @@
 {
   GncTreeModelAccountPrivate *priv;
   time_t t1, t2;
-  gnc_numeric b1, b2, b3;  
+  gnc_numeric b3;  
 
   priv = GNC_TREE_MODEL_ACCOUNT_GET_PRIVATE(model);
   if (acct == priv->toplevel)
@@ -617,14 +617,7 @@
   if (t1 > t2)
     return g_strdup("");
 
-  if (recurse) {
-    b1 = xaccAccountGetBalanceAsOfDateInCurrency(acct, t1, NULL, TRUE);
-    b2 = xaccAccountGetBalanceAsOfDateInCurrency(acct, t2, NULL, TRUE);
-  } else {
-    b1 = xaccAccountGetBalanceAsOfDate(acct, t1);
-    b2 = xaccAccountGetBalanceAsOfDate(acct, t2);
-  }
-  b3 = gnc_numeric_sub(b2, b1, GNC_DENOM_AUTO, GNC_HOW_DENOM_FIXED);
+  b3 = xaccAccountGetBalanceChangeForPeriod(acct, t1, t2, recurse);
   if (gnc_reverse_balance (acct))
     b3 = gnc_numeric_neg (b3);