IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

More moving of properties from the public data structure to a private

Browse Source 
data structure, with access to them as properties of the object.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@15891 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2007-04-14 22:48:22 +00:00
parent 70af105a88
commit c089bf0fbd
9 changed files with 360 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/backend/file/gnc-account-xml-v2.c
View File

@ -77,7 +77,7 @@ gnc_account_dom_tree_create(Account *act,
const char *str;
kvp_frame *kf;
xmlNodePtr ret;
GList *n;
GList *lots, *n;
Account *parent;
ENTER ("(account=%p)", act);
@ -133,18 +133,19 @@ gnc_account_dom_tree_create(Account *act,
xaccAccountGetGUID(parent)));
}
n = xaccAccountGetLotList (act);
PINFO ("lot list=%p", n);
if (n && !exporting)
lots = xaccAccountGetLotList (act);
PINFO ("lot list=%p", lots);
if (lots && !exporting)
{
xmlNodePtr toaddto = xmlNewChild(ret, NULL, BAD_CAST act_lots_string, NULL);
for (; n; n=n->next)
for (n = lots; n; n=n->next)
{
GNCLot * lot = n->data;
xmlAddChild(toaddto, gnc_lot_dom_tree_create(lot));
}
}
g_list_free(lots);
LEAVE("");
return ret;

13
src/backend/postgres/account.c
View File

@ -101,8 +101,8 @@ pgendStoreAccountNoLock (PGBackend *be, Account *acct,
{
if (0 < pgendAccountCompareVersion (be, acct)) return;
}
acct->version ++; /* be sure to update the version !! */
acct->version_check = be->version_check;
gnc_account_increment_version(acct); /* be sure to update the version !! */
gnc_account_set_version_check(acct, be->version_check);
if ((0 == acct->idata) &&
(FALSE == kvp_frame_is_empty (xaccAccountGetSlots(acct))))
@ -493,7 +493,8 @@ pgendCopyAccountToEngine (PGBackend *be, const GUID *acct_guid)
{
/* save some performance, don't go to the
* backend if the data is recent. */
if (MAX_VERSION_AGE >= be->version_check - acc->version_check)
guint32 value = gnc_account_get_version_check(acc);
if (MAX_VERSION_AGE >= be->version_check - value)
{
PINFO ("fresh data, skip check");
engine_data_is_newer = 0;
@ -526,7 +527,7 @@ pgendCopyAccountToEngine (PGBackend *be, const GUID *acct_guid)
acc->inst.kvp_data = pgendKVPFetch (be, acc->idata, acc->inst.kvp_data);
}
acc->version_check = be->version_check;
gnc_account_set_version_check(acc, be->version_check);
}
}
@ -589,8 +590,8 @@ pgend_account_commit_edit (QofBackend * bend,
LEAVE ("rolled back");
return;
}
acct->version ++; /* be sure to update the version !! */
acct->version_check = be->version_check;
gnc_account_increment_version(acct); /* be sure to update the version !! */
gnc_account_set_version_check(acct, be->version_check);
if (acct->inst.do_free)
{

384
src/engine/Account.c
View File

@ -39,7 +39,6 @@
#include "gnc-lot.h"
#include "gnc-lot-p.h"
#include "gnc-pricedb.h"
#include "policy.h"
#define GNC_ID_ROOT_ACCOUNT "RootAccount"
@ -78,6 +77,9 @@ enum {
PROP_ACCT_VERSION_CHECK,
PROP_POLICY,
PROP_MARK,
PROP_TAX_RELATED,
PROP_TAX_CODE,
PROP_TAX_SOURCE,
};
typedef struct AccountPrivate
@ -134,28 +136,23 @@ typedef struct AccountPrivate
// gnc_numeric balance;
// gnc_numeric cleared_balance;
// gnc_numeric reconciled_balance;
//
// /* version number, used for tracking multiuser updates */
// gint32 version;
// guint32 version_check; /* data aging timestamp */
//
/* version number, used for tracking multiuser updates */
gint32 version;
guint32 version_check; /* data aging timestamp */
// SplitList *splits; /* list of split pointers */
// LotList *lots; /* list of lot pointers */
//
// /* Cached pointer to policy method */
// GNCPolicy *policy;
//
LotList *lots; /* list of lot pointers */
GNCPolicy *policy; /* Cached pointer to policy method */
// gboolean balance_dirty; /* balances in splits incorrect */
// gboolean sort_dirty; /* sort order of splits is bad */
//
// /* The "mark" flag can be used by the user to mark this account
// * in any way desired. Handy for specialty traversals of the
// * account tree. */
// short mark;
//
// /* -------------------------------------------------------------- */
// /* Backend private expansion data */
// guint32 idata; /* used by the sql backend for kvp management */
/* The "mark" flag can be used by the user to mark this account
* in any way desired. Handy for specialty traversals of the
* account tree. */
short mark;
} AccountPrivate;
#define GET_PRIVATE(o) \
@ -239,6 +236,13 @@ gnc_account_init(Account* acc)
priv->type = ACCT_TYPE_NONE;
priv->version = 0;
priv->version_check = 0;
priv->mark = 0;
priv->policy = xaccGetFIFOPolicy();
priv->lots = NULL;
// priv->commodity = NULL;
// priv->commodity_scu = 0;
// priv->non_standard_scu = FALSE;
@ -251,11 +255,6 @@ gnc_account_init(Account* acc)
// priv->starting_cleared_balance = gnc_numeric_zero();
// priv->starting_reconciled_balance = gnc_numeric_zero();
//
// priv->version = 0;
// priv->version_check = 0;
//
// priv->policy = xaccGetFIFOPolicy();
//
// priv->balance_dirty = FALSE;
// priv->sort_dirty = FALSE;
}
@ -305,6 +304,29 @@ gnc_account_get_property (GObject *object,
// NEED TO BE CONVERTED TO A G_TYPE_ENUM
g_value_set_int(value, priv->type);
break;
case PROP_ACCT_VERSION:
g_value_set_int(value, priv->version);
break;
case PROP_ACCT_VERSION_CHECK:
g_value_set_uint(value, priv->version_check);
break;
case PROP_POLICY:
/* MAKE THIS A BOXED VALUE */
g_value_set_pointer(value, priv->policy);
break;
case PROP_MARK:
g_value_set_int(value, priv->mark);
break;
case PROP_TAX_RELATED:
g_value_set_boolean(value, xaccAccountGetTaxRelated(account));
break;
case PROP_TAX_CODE:
g_value_set_string(value, xaccAccountGetTaxUSCode(account));
break;
case PROP_TAX_SOURCE:
g_value_set_string(value,
xaccAccountGetTaxUSPayerNameSource(account));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@ -341,6 +363,27 @@ gnc_account_set_property (GObject *object,
// NEED TO BE CONVERTED TO A G_TYPE_ENUM
xaccAccountSetType(account, g_value_get_int(value));
break;
case PROP_ACCT_VERSION:
xaccAccountSetVersion(account, g_value_get_int(value));
break;
case PROP_ACCT_VERSION_CHECK:
gnc_account_set_version_check(account, g_value_get_uint(value));
break;
case PROP_POLICY:
gnc_account_set_policy(account, g_value_get_pointer(value));
break;
case PROP_MARK:
xaccAccountSetMark(account, g_value_get_int(value));
break;
case PROP_TAX_RELATED:
xaccAccountSetTaxRelated(account, g_value_get_boolean(value));
break;
case PROP_TAX_CODE:
xaccAccountSetTaxUSCode(account, g_value_get_string(value));
break;
case PROP_TAX_SOURCE:
xaccAccountSetTaxUSPayerNameSource(account,
g_value_get_string(value));
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
break;
@ -434,6 +477,78 @@ gnc_account_class_init (AccountClass *klass)
NUM_ACCOUNT_TYPES - 1,
ACCT_TYPE_BANK,
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_ACCT_VERSION,
g_param_spec_int ("acct-version",
"Version",
"The version number of the current account state.",
0,
G_MAXINT32,
0,
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_ACCT_VERSION_CHECK,
g_param_spec_uint ("acct-version-check",
"Version Check",
"The version check number of the current account state.",
0,
G_MAXUINT32,
0,
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_POLICY,
g_param_spec_pointer ("policy",
"Policy",
"The account lots policy.",
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_MARK,
g_param_spec_int ("acct-mark",
"Account Mark",
"Ipsum Lorem",
0,
G_MAXINT16,
0,
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_TAX_RELATED,
g_param_spec_boolean ("tax-related",
"Tax Related",
"Whether the account maps to an entry on an "
"income tax document.",
FALSE,
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_TAX_CODE,
g_param_spec_string ("tax-code",
"Tax Code",
"This is the code for mapping an account to a "
"specific entry on a taxable document. In the "
"United States it is used to transfer totals "
"into tax preparation software.",
NULL,
G_PARAM_READWRITE));
g_object_class_install_property
(gobject_class,
PROP_TAX_SOURCE,
g_param_spec_string ("tax-source",
"Tax Source",
"This is an unknown tax related field.",
NULL,
G_PARAM_READWRITE));
}
static void
@ -457,11 +572,7 @@ xaccInitAccount (Account * acc, QofBook *book)
acc->non_standard_scu = FALSE;
acc->splits = NULL;
acc->lots = NULL;
acc->policy = xaccGetFIFOPolicy();
acc->version = 0;
acc->version_check = 0;
acc->balance_dirty = FALSE;
acc->sort_dirty = FALSE;
@ -664,7 +775,11 @@ xaccFreeAccountChildren (Account *acc)
priv->children = NULL;
}
void
/* The xaccFreeAccount() routine releases memory associated with the
* account. It should never be called directly from user code;
* instead, the xaccAccountDestroy() routine should be used (because
* xaccAccountDestroy() has the correct commit semantics). */
static void
xaccFreeAccount (Account *acc)
{
AccountPrivate *priv;
@ -685,18 +800,18 @@ xaccFreeAccount (Account *acc)
}
/* remove lots -- although these should be gone by now. */
if (acc->lots)
if (priv->lots)
{
PERR (" instead of calling xaccFreeAccount(), please call \n"
" xaccAccountBeginEdit(); xaccAccountDestroy(); \n");
for (lp=acc->lots; lp; lp=lp->next)
for (lp=priv->lots; lp; lp=lp->next)
{
GNCLot *lot = lp->data;
gnc_lot_destroy (lot);
}
g_list_free (acc->lots);
acc->lots = NULL;
g_list_free (priv->lots);
priv->lots = NULL;
}
/* Next, clean up the splits */
@ -739,7 +854,7 @@ xaccFreeAccount (Account *acc)
priv->type = ACCT_TYPE_NONE;
acc->commodity = NULL;
acc->version = 0;
priv->version = 0;
acc->balance_dirty = FALSE;
acc->sort_dirty = FALSE;
@ -836,13 +951,13 @@ xaccAccountCommitEdit (Account *acc)
}
/* the lots should be empty by now */
for (lp = acc->lots; lp; lp = lp->next)
for (lp = priv->lots; lp; lp = lp->next)
{
GNCLot *lot = lp->data;
gnc_lot_destroy (lot);
}
g_list_free (acc->lots);
acc->lots = NULL;
g_list_free(priv->lots);
priv->lots = NULL;
qof_instance_set_dirty(&acc->inst);
acc->inst.editlevel--;
@ -867,17 +982,53 @@ xaccAccountDestroy (Account *acc)
void
xaccAccountSetVersion (Account *acc, gint32 vers)
{
if (!acc) return;
acc->version = vers;
AccountPrivate *priv;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
priv = GET_PRIVATE(acc);
priv->version = vers;
}
gint32
xaccAccountGetVersion (const Account *acc)
{
if (!acc) return 0;
return (acc->version);
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), 0);
return GET_PRIVATE(acc)->version;
}
void
gnc_account_increment_version (Account *acc)
{
AccountPrivate *priv;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
priv = GET_PRIVATE(acc);
priv->version++;
}
guint32
gnc_account_get_version_check (const Account *acc)
{
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), 0);
return GET_PRIVATE(acc)->version_check;
}
void
gnc_account_set_version_check (Account *acc, guint32 value)
{
AccountPrivate *priv;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
priv = GET_PRIVATE(acc);
priv->version_check = value;
}
/********************************************************************\
\********************************************************************/
@ -1194,14 +1345,20 @@ xaccAccountLookup (const GUID *guid, QofBook *book)
short
xaccAccountGetMark (const Account *acc)
{
return acc ? acc->mark : 0;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), 0);
return GET_PRIVATE(acc)->mark;
}
void
xaccAccountSetMark (Account *acc, short m)
{
if (acc)
acc->mark = m;
AccountPrivate *priv;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
priv = GET_PRIVATE(acc);
priv->mark = m;
}
void
@ -1209,7 +1366,8 @@ xaccClearMark (Account *acc, short val)
{
Account *root;
if (!acc) return;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
root = gnc_account_get_root(acc);
xaccClearMarkDown(root ? root : acc, val);
}
@ -1220,10 +1378,10 @@ xaccClearMarkDown (Account *acc, short val)
AccountPrivate *priv;
GList *node;
if (!acc) return;
priv = GET_PRIVATE(acc);
acc->mark = val;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
priv = GET_PRIVATE(acc);
priv->mark = val;
for (node = priv->children; node; node = node->next) {
xaccClearMarkDown(node->data, val);
}
@ -1232,32 +1390,69 @@ xaccClearMarkDown (Account *acc, short val)
/********************************************************************\
\********************************************************************/
GNCPolicy *
gnc_account_get_policy (Account *acc)
{
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
return GET_PRIVATE(acc)->policy;
}
void
gnc_account_set_policy (Account *acc, GNCPolicy *policy)
{
AccountPrivate *priv;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
priv = GET_PRIVATE(acc);
priv->policy = policy ? policy : xaccGetFIFOPolicy();
}
/********************************************************************\
\********************************************************************/
void
xaccAccountRemoveLot (Account *acc, GNCLot *lot)
{
if (!acc || !lot || !acc->lots) return;
ENTER ("(acc=%p, lot=%p)", acc, lot);
AccountPrivate *priv;
acc->lots = g_list_remove (acc->lots, lot);
g_return_if_fail(GNC_IS_ACCOUNT(acc));
g_return_if_fail(GNC_IS_LOT(lot));
priv = GET_PRIVATE(acc);
g_return_if_fail(priv->lots);
ENTER ("(acc=%p, lot=%p)", acc, lot);
priv->lots = g_list_remove(priv->lots, lot);
LEAVE ("(acc=%p, lot=%p)", acc, lot);
}
void
xaccAccountInsertLot (Account *acc, GNCLot *lot)
{
AccountPrivate *priv, *opriv;
Account * old_acc = NULL;
if (!acc || !lot || lot->account == acc) return;
ENTER ("(acc=%p, lot=%p)", acc, lot);
/* errors */
g_return_if_fail(GNC_IS_ACCOUNT(acc));
g_return_if_fail(GNC_IS_LOT(lot));
/* optimizations */
if (lot->account == acc)
return;
ENTER ("(acc=%p, lot=%p)", acc, lot);
/* pull it out of the old account */
if (lot->account) {
old_acc = lot->account;
old_acc->lots = g_list_remove (old_acc->lots, lot);
opriv = GET_PRIVATE(old_acc);
opriv->lots = g_list_remove(opriv->lots, lot);
}
acc->lots = g_list_prepend (acc->lots, lot);
priv = GET_PRIVATE(acc);
priv->lots = g_list_prepend(priv->lots, lot);
lot->account = acc;
/* Don't move the splits to the new account. The caller will do this
@ -1290,8 +1485,17 @@ xaccPostSplitMove (Split *split, Account *accto)
void
xaccAccountMoveAllSplits (Account *accfrom, Account *accto)
{
/* Handle special cases. */
if (!accfrom || !accto || !accfrom->splits || accfrom == accto) return;
AccountPrivate *from_priv, *to_priv;
/* errors */
g_return_if_fail(GNC_IS_ACCOUNT(accfrom));
g_return_if_fail(GNC_IS_ACCOUNT(accto));
/* optimizations */
from_priv = GET_PRIVATE(accfrom);
to_priv = GET_PRIVATE(accto);
if (!accfrom->splits || accfrom == accto)
return;
/* check for book mix-up */
g_return_if_fail (accfrom->inst.book == accto->inst.book);
@ -1304,7 +1508,7 @@ xaccAccountMoveAllSplits (Account *accfrom, Account *accto)
/* Concatenate accfrom's lists of splits and lots to accto's lists. */
//accto->splits = g_list_concat(accto->splits, accfrom->splits);
//accto->lots = g_list_concat(accto->lots, accfrom->lots);
//to_priv->lots = g_list_concat(to_priv->lots, from_priv->lots);
/* Set appropriate flags. */
//accfrom->balance_dirty = TRUE;
@ -1321,7 +1525,7 @@ xaccAccountMoveAllSplits (Account *accfrom, Account *accto)
/* Finally empty accfrom. */
g_assert(accfrom->splits == NULL);
g_assert(accfrom->lots == NULL);
g_assert(from_priv->lots == NULL);
xaccAccountCommitEdit(accfrom);
xaccAccountCommitEdit(accto);
@ -2109,7 +2313,7 @@ gnc_account_lookup_by_full_name (const Account *any_acc,
gchar **names;
g_return_val_if_fail(GNC_IS_ACCOUNT(any_acc), NULL);
g_return_val_if_fail(name, 0);
g_return_val_if_fail(name, NULL);
root = any_acc;
rpriv = GET_PRIVATE(root);
@ -2760,13 +2964,15 @@ xaccAccountGetBalanceChangeForPeriod (Account *acc, time_t t1, time_t t2, gboole
SplitList *
xaccAccountGetSplitList (const Account *acc)
{
return acc ? acc->splits : NULL;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
return acc->splits;
}
LotList *
xaccAccountGetLotList (const Account *acc)
{
return acc ? acc->lots : NULL;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
return g_list_copy(GET_PRIVATE(acc)->lots);
}
LotList *
@ -2775,14 +2981,14 @@ xaccAccountFindOpenLots (const Account *acc,
gpointer user_data),
gpointer user_data, GCompareFunc sort_func)
{
AccountPrivate *priv;
GList *lot_list;
GList *retval = NULL;
if (!acc)
return NULL;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
lot_list = xaccAccountGetLotList (acc);
for ( ; lot_list ; lot_list = lot_list->next ) {
priv = GET_PRIVATE(acc);
for (lot_list = priv->lots; lot_list; lot_list = lot_list->next) {
GNCLot *lot = lot_list->data;
/* If this lot is closed, then ignore it */
@ -2806,12 +3012,15 @@ gpointer
xaccAccountForEachLot(const Account *acc,
gpointer (*proc)(GNCLot *lot, void *data), void *data)
{
AccountPrivate *priv;
LotList *node;
gpointer result = NULL;
if (!acc || !proc) return NULL;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
g_return_val_if_fail(proc, NULL);
for (node = acc->lots; node; node = node->next)
priv = GET_PRIVATE(acc);
for (node = priv->lots; node; node = node->next)
if ((result = proc((GNCLot *)node->data, data)))
break;
@ -2825,7 +3034,8 @@ xaccAccountForEachLot(const Account *acc,
gboolean
xaccAccountGetTaxRelated (const Account *acc)
{
return acc ? kvp_frame_get_gint64(acc->inst.kvp_data, "tax-related") : FALSE;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), FALSE);
return kvp_frame_get_gint64(acc->inst.kvp_data, "tax-related");
}
void
@ -2833,8 +3043,7 @@ xaccAccountSetTaxRelated (Account *acc, gboolean tax_related)
{
KvpValue *new_value;
if (!acc)
return;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
if (tax_related)
new_value = kvp_value_new_gint64 (tax_related);
@ -2850,13 +3059,14 @@ xaccAccountSetTaxRelated (Account *acc, gboolean tax_related)
const char *
xaccAccountGetTaxUSCode (const Account *acc)
{
return acc ? kvp_frame_get_string(acc->inst.kvp_data, "tax-US/code") : NULL;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
return kvp_frame_get_string(acc->inst.kvp_data, "tax-US/code");
}
void
xaccAccountSetTaxUSCode (Account *acc, const char *code)
{
if (!acc) return;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
xaccAccountBeginEdit (acc);
kvp_frame_set_string (acc->inst.kvp_data, "/tax-US/code", code);
@ -2867,14 +3077,15 @@ xaccAccountSetTaxUSCode (Account *acc, const char *code)
const char *
xaccAccountGetTaxUSPayerNameSource (const Account *acc)
{
return acc ? kvp_frame_get_string(acc->inst.kvp_data,
"tax-US/payer-name-source") : NULL;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), NULL);
return kvp_frame_get_string(acc->inst.kvp_data,
"tax-US/payer-name-source");
}
void
xaccAccountSetTaxUSPayerNameSource (Account *acc, const char *source)
{
if (!acc) return;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
xaccAccountBeginEdit (acc);
kvp_frame_set_string (acc->inst.kvp_data,
@ -2890,7 +3101,8 @@ gboolean
xaccAccountGetPlaceholder (const Account *acc)
{
const char *str;
if (!acc) return FALSE;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), FALSE);
str = kvp_frame_get_string(acc->inst.kvp_data, "placeholder");
return (str && !strcmp(str, "true"));
@ -2899,7 +3111,7 @@ xaccAccountGetPlaceholder (const Account *acc)
void
xaccAccountSetPlaceholder (Account *acc, gboolean val)
{
if (!acc) return;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
xaccAccountBeginEdit (acc);
kvp_frame_set_string (acc->inst.kvp_data,
@ -2914,7 +3126,7 @@ xaccAccountGetDescendantPlaceholder (const Account *acc)
GList *descendants, *node;
GNCPlaceholderType ret = PLACEHOLDER_NONE;
if (!acc) return PLACEHOLDER_NONE;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), PLACEHOLDER_NONE);
if (xaccAccountGetPlaceholder(acc)) return PLACEHOLDER_THIS;
descendants = gnc_account_get_descendants(acc);
@ -2935,7 +3147,8 @@ gboolean
xaccAccountGetHidden (const Account *acc)
{
const char *str;
if (!acc) return FALSE;
g_return_val_if_fail(GNC_IS_ACCOUNT(acc), FALSE);
str = kvp_frame_get_string(acc->inst.kvp_data, "hidden");
return (str && !strcmp(str, "true"));
@ -2944,7 +3157,7 @@ xaccAccountGetHidden (const Account *acc)
void
xaccAccountSetHidden (Account *acc, gboolean val)
{
if (!acc) return;
g_return_if_fail(GNC_IS_ACCOUNT(acc));
xaccAccountBeginEdit (acc);
kvp_frame_set_string (acc->inst.kvp_data, "hidden",
@ -3632,7 +3845,9 @@ gnc_account_copy_children (Account *to, Account *from)
/* optimizations */
to_priv = GET_PRIVATE(to);
from_priv = GET_PRIVATE(from);
if (!from_priv->children) return;
if (!from_priv->children)
return;
to_book = gnc_account_get_book(to);
if (!to_book) return;
@ -3969,6 +4184,7 @@ gboolean xaccAccountRegister (void)
// Local Variables:
// mode: c
// indent-tabs-mode: t
// indent-tabs-mode: nil
// c-block-comment-prefix: "* "
// eval: (c-add-style "gnc" '("k&r" (c-basic-offset . 4) (c-offsets-alist (case-label . +))) t)
// End:

36
src/engine/Account.h
View File

@ -46,6 +46,7 @@
#define XACC_ACCOUNT_H
#include "qof.h"
#include "gnc-engine.h"
#include "policy.h"
typedef gnc_numeric (*xaccGetBalanceFn)( const Account *account );
@ -59,7 +60,9 @@ typedef gnc_numeric (*xaccGetBalanceAsOfDateFn) (
typedef void (*AccountCb)(Account *a, gpointer data);
typedef gpointer (*AccountCb2)(Account *a, gpointer data);
typedef struct _AccountClass AccountClass;
typedef struct {
QofInstanceClass parent_class;
} AccountClass;
/* --- type macros --- */
#define GNC_TYPE_ACCOUNT (gnc_account_get_type ())
@ -258,6 +261,15 @@ void xaccAccountSetDescription (Account *account, const char *desc);
void xaccAccountSetNotes (Account *account, const char *notes);
/** Set the last num field of an Account */
void xaccAccountSetLastNum (Account *account, const char *num);
/** Set the account's lot order policy */
void gnc_account_set_policy (Account *account, GNCPolicy *policy);
/** Set the version numbers on this account. The version number is
* used to manage multi-user updates. */
void xaccAccountSetVersion (Account*, gint32);
/** Increment the account version number */
void gnc_account_increment_version (Account *acc);
/** Set the account version_check number */
void gnc_account_set_version_check (Account *acc, guint32 value);
/** Get the account's type */
GNCAccountType xaccAccountGetType (const Account *account);
/** Is the account a stock, mutual fund or currency? */
@ -273,6 +285,13 @@ const char * xaccAccountGetDescription (const Account *account);
const char * xaccAccountGetNotes (const Account *account);
/** Get the last num field of an Account */
const char * xaccAccountGetLastNum (const Account *account);
/** Get the account's lot order policy */
GNCPolicy *gnc_account_get_policy (Account *account);
/** Get the version numbers on this account. The version number is
* used to manage multi-user updates. */
gint32 xaccAccountGetVersion (const Account* acc);
/** Get the account version_check number */
guint32 gnc_account_get_version_check (const Account *acc);
/** The xaccAccountGetFullName routine returns the fully qualified name
* of the account using the given separator char. The name must be
@ -903,13 +922,14 @@ Split * xaccAccountFindSplitByDesc(const Account *account,
void xaccAccountInsertLot (Account *, GNCLot *);
void xaccAccountRemoveLot (Account *, GNCLot *);
/** The xaccAccountGetLotList() routine returns a pointer to the GList of
* the lots in this account.
* @note This GList is the account's internal
* data structure: do not delete it when done; treat it as a read-only
* structure. Note that some routines (such as xaccAccountRemoveLot())
* modify this list directly, and could leave you with a corrupted
* pointer. */
/** The xaccAccountGetLotList() routine returns a list of all lots in
* this account.
*
* @param account The account whose lots should be returned.
*
* @return A GList of lot pointers, or NULL if there are no lots in
* this account children. It is the callers responsibility to free
* any returned list with the g_list_free() function. */
LotList* xaccAccountGetLotList (const Account *account);
/** The xaccAccountForEachLot() method will apply the function 'proc'

35
src/engine/AccountP.h
View File

@ -42,7 +42,6 @@
#include "Account.h"
#include "gnc-commodity.h"
#include "gnc-engine.h"
#include "policy.h"
/** STRUCTS *********************************************************/
@ -75,34 +74,16 @@ struct account_s
gnc_numeric cleared_balance;
gnc_numeric reconciled_balance;
/* version number, used for tracking multiuser updates */
gint32 version;
guint32 version_check; /* data aging timestamp */
SplitList *splits; /* list of split pointers */
LotList *lots; /* list of lot pointers */
/* Cached pointer to policy method */
GNCPolicy *policy;
gboolean balance_dirty; /* balances in splits incorrect */
gboolean sort_dirty; /* sort order of splits is bad */
/* The "mark" flag can be used by the user to mark this account
* in any way desired. Handy for specialty traversals of the
* account tree. */
short mark;
/* -------------------------------------------------------------- */
/* Backend private expansion data */
guint32 idata; /* used by the sql backend for kvp management */
};
struct _AccountClass
{
QofInstanceClass parent_class;
};
/* The xaccAccountSortSplits() routine will resort the account's
* splits if the sort is dirty. If 'force' is true, the account
* is sorted even if the editlevel is not zero.
@ -136,22 +117,6 @@ void xaccAccountSetStartingBalance(Account *account,
const gnc_numeric start_cleared_baln,
const gnc_numeric start_reconciled_baln);
/* The xaccFreeAccount() routine releases memory associated with the
* account. It should never be called directly from user code;
* instead, the xaccAccountDestroy() routine should be used
* (because xaccAccountDestroy() has the correct commit semantics).
*/
void xaccFreeAccount (Account *account);
/* The xaccAccountSet/GetVersion() routines set & get the version
* numbers on this account. The version number is used to manage
* multi-user updates. These routines are private because we don't
* want anyone except the backend to mess with them.
*/
void xaccAccountSetVersion (Account*, gint32);
gint32 xaccAccountGetVersion (const Account* acc);
/* Register Accounts with the engine */
gboolean xaccAccountRegister (void);

2
src/engine/Scrub2.c
View File

@ -100,7 +100,7 @@ xaccLotFill (GNCLot *lot)
if (!lot) return;
acc = lot->account;
pcy = acc->policy;
pcy = gnc_account_get_policy(acc);
ENTER ("(lot=%s, acc=%s)", gnc_lot_get_title(lot), xaccAccountGetName(acc));

8
src/engine/Scrub3.c
View File

@ -92,7 +92,7 @@ xaccScrubLot (GNCLot *lot)
ENTER ("(lot=%p) %s", lot, gnc_lot_get_title(lot));
acc = gnc_lot_get_account (lot);
pcy = acc->policy;
pcy = gnc_account_get_policy(acc);
xaccAccountBeginEdit(acc);
xaccScrubMergeLotSubSplits (lot);
@ -156,7 +156,7 @@ rethin:
void
xaccAccountScrubLots (Account *acc)
{
LotList *node;
LotList *lots, *node;
if (!acc) return;
if (FALSE == xaccAccountHasTrades (acc)) return;
@ -164,11 +164,13 @@ xaccAccountScrubLots (Account *acc)
xaccAccountBeginEdit(acc);
xaccAccountAssignLots (acc);
for (node = acc->lots; node; node=node->next)
lots = xaccAccountGetLotList(acc);
for (node = lots; node; node=node->next)
{
GNCLot *lot = node->data;
xaccScrubLot (lot);
}
g_list_free(lots);
xaccAccountCommitEdit(acc);
LEAVE ("(acc=%s)", xaccAccountGetName(acc));
}

6
src/engine/cap-gains.c
View File

@ -613,7 +613,7 @@ xaccSplitAssign (Split *split)
ENTER ("(split=%p)", split);
pcy = acc->policy;
pcy = gnc_account_get_policy(acc);
xaccAccountBeginEdit (acc);
/* If we are here, this split does not belong to any lot.
@ -706,7 +706,7 @@ xaccSplitComputeCapGains(Split *split, Account *gain_acc)
if (!split) return;
lot = split->lot;
if (!lot) return;
pcy = lot->account->policy;
pcy = gnc_account_get_policy(lot->account);
currency = split->parent->common_currency;
ENTER ("(split=%p gains=%p status=0x%x lot=%s)", split,
@ -1097,7 +1097,7 @@ xaccLotComputeCapGains (GNCLot *lot, Account *gain_acc)
* to mark all splits dirty if the opening splits are dirty. */
ENTER("(lot=%p)", lot);
pcy = lot->account->policy;
pcy = gnc_account_get_policy(lot->account);
for (node = lot->splits; node; node = node->next)
{
Split *s = node->data;

1
src/gnome/lot-viewer.c
View File

@ -450,6 +450,7 @@ gnc_lot_viewer_fill (GNCLotViewer *lv)
/* Self-reference */
gtk_list_store_set(store, &iter, LOT_COL_PNTR, lot, -1);
}
g_list_free(lot_list);
/* re-select the row that the user had previously selected,
* if possible. */