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

Modify xaccAccountChildrenEqual to not depend upon the order

Browse Source 
A SQL backend can't be expected to always return children in the same order.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@23173 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
John Ralls 2013-09-17 23:25:43 +00:00
parent 213344f378
commit e5ea307906
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/engine/Account.c
View File

@ -1248,6 +1248,20 @@ xaccAccountDestroy (Account *acc)
/********************************************************************\
\********************************************************************/
static gint
compare_account_by_name (gconstpointer a, gconstpointer b)
{
AccountPrivate *priv_a, *priv_b;
if (a && !b) return 1;
if (b && !a) return -1;
if (!a && !b) return 0;
priv_a = GET_PRIVATE((Account*)a);
priv_b = GET_PRIVATE((Account*)b);
if ((priv_a->accountCode && strlen (priv_a->accountCode)) ||
(priv_b->accountCode && strlen (priv_b->accountCode)))
return g_strcmp0 (priv_a->accountCode, priv_b->accountCode);
return g_strcmp0 (priv_a->accountName, priv_b->accountName);
}
static gboolean
xaccAcctChildrenEqual(const GList *na,
@ -1256,15 +1270,28 @@ xaccAcctChildrenEqual(const GList *na,
{
if ((!na && nb) || (na && !nb))
{
PWARN ("only one has accounts");
PINFO ("only one has accounts");
return(FALSE);
}
if (g_list_length ((GList*)na) != g_list_length ((GList*)nb))
{
PINFO ("Accounts have different numbers of children");
return (FALSE);
}
while (na && nb)
while (na)
{
Account *aa = na->data;
Account *ab = nb->data;
Account *ab;
GList *node = g_list_find_custom ((GList*)nb, aa,
(GCompareFunc)compare_account_by_name);
if (!node)
{
PINFO ("Unable to find matching child account.");
return FALSE;
}
ab = node->data;
if (!xaccAccountEqual(aa, ab, check_guids))
{
char sa[GUID_ENCODING_LENGTH + 1];
@ -1279,13 +1306,6 @@ xaccAcctChildrenEqual(const GList *na,
}
na = na->next;
nb = nb->next;
}
if (na || nb)
{
PWARN ("different numbers of accounts");
return(FALSE);
}
return(TRUE);