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

finish adding suport for save/restore of lots

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6909 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas 2002-05-24 14:59:29 +00:00
parent aa8daf8345
commit 9744356c43
3 changed files with 125 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -59,21 +59,27 @@ const gchar *account_version_string = "2.0.0";
#define act_type_string "act:type"
#define act_commodity_string "act:commodity"
#define act_commodity_scu_string "act:commodity-scu"
#define act_currency_string "act:currency"
#define act_currency_scu_string "act:currency-scu"
#define act_code_string "act:code"
#define act_description_string "act:description"
#define act_security_string "act:security"
#define act_security_scu_string "act:security-scu"
#define act_slots_string "act:slots"
#define act_parent_string "act:parent"
#define act_lots_string "act:lots"
/* The currency and security strings should not appear in newer
* xml files (anything post-gnucash-1.6) */
#define act_currency_string "act:currency"
#define act_currency_scu_string "act:currency-scu"
#define act_security_string "act:security"
#define act_security_scu_string "act:security-scu"
xmlNodePtr
gnc_account_dom_tree_create(Account *act)
{
const char *str;
kvp_frame *kf;
kvp_frame *kf;
xmlNodePtr ret;
xmlNodePtr toaddto;
GList *n;
ret = xmlNewNode(NULL, gnc_account_string);
xmlSetProp(ret, "version", account_version_string);
@ -93,13 +99,13 @@ gnc_account_dom_tree_create(Account *act)
xmlAddChild(ret, int_to_dom_tree(act_commodity_scu_string,
xaccAccountGetCommoditySCU(act)));
str = xaccAccountGetCode(act);
str = xaccAccountGetCode(act);
if (str && strlen(str) > 0)
{
xmlAddChild(ret, text_to_dom_tree(act_code_string, str));
}
str = xaccAccountGetDescription(act);
str = xaccAccountGetDescription(act);
if (str && strlen(str) > 0)
{
xmlAddChild(ret, text_to_dom_tree(act_description_string, str));
@ -121,6 +127,14 @@ gnc_account_dom_tree_create(Account *act)
act_parent_string,
xaccAccountGetGUID(xaccAccountGetParentAccount(act))));
}
toaddto = xmlNewChild(ret, NULL, act_lots_string, NULL);
for (n=xaccAccountGetLotList(act); n; n=n->next)
{
GNCLot * lot =n->data;
xmlAddChild(toaddto, gnc_lot_dom_tree_create(lot));
}
return ret;
}
@ -209,8 +223,12 @@ account_commodity_scu_handler (xmlNodePtr node, gpointer act_pdata)
return TRUE;
}
/* ============================================================== */
/* The following depricated routines are here only to service
* older XML files. */
static gboolean
account_currency_handler (xmlNodePtr node, gpointer act_pdata)
depricated_account_currency_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
gnc_commodity *ref;
@ -222,7 +240,7 @@ account_currency_handler (xmlNodePtr node, gpointer act_pdata)
}
static gboolean
account_currency_scu_handler (xmlNodePtr node, gpointer act_pdata)
depricated_account_currency_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
gint64 val;
@ -234,7 +252,7 @@ account_currency_scu_handler (xmlNodePtr node, gpointer act_pdata)
}
static gboolean
account_security_handler (xmlNodePtr node, gpointer act_pdata)
depricated_account_security_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
gnc_commodity *ref;
@ -246,7 +264,7 @@ account_security_handler (xmlNodePtr node, gpointer act_pdata)
}
static gboolean
account_security_scu_handler (xmlNodePtr node, gpointer act_pdata)
depricated_account_security_scu_handler (xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
gint64 val;
@ -257,6 +275,8 @@ account_security_scu_handler (xmlNodePtr node, gpointer act_pdata)
return TRUE;
}
/* ============================================================== */
static gboolean
account_slots_handler (xmlNodePtr node, gpointer act_pdata)
{
@ -311,20 +331,55 @@ account_description_handler(xmlNodePtr node, gpointer act_pdata)
return set_string(node, pdata->account, xaccAccountSetDescription);
}
static gboolean
account_lots_handler(xmlNodePtr node, gpointer act_pdata)
{
struct account_pdata *pdata = act_pdata;
xmlNodePtr mark;
g_return_val_if_fail(node, FALSE);
g_return_val_if_fail(node->xmlChildrenNode, FALSE);
for(mark = node->xmlChildrenNode; mark; mark = mark->next)
{
GNCLot *lot;
if(safe_strcmp("text", mark->name) == 0)
continue;
lot = dom_tree_to_lot(mark, pdata->book);
if(lot)
{
xaccAccountInsertLot (pdata->account, lot);
}
else
{
return FALSE;
}
}
return TRUE;
}
static struct dom_tree_handler account_handlers_v2[] = {
{ act_name_string, account_name_handler, 1, 0 },
{ act_id_string, account_id_handler, 1, 0 },
{ act_type_string, account_type_handler, 1, 0 },
{ act_commodity_string, account_commodity_handler, 0, 0 },
{ act_commodity_scu_string, account_commodity_scu_handler, 0, 0 },
{ act_currency_string, account_currency_handler, 0, 0 },
{ act_currency_scu_string, account_currency_scu_handler, 0, 0 },
{ act_code_string, account_code_handler, 0, 0 },
{ act_description_string, account_description_handler, 0, 0},
{ act_security_string, account_security_handler, 0, 0 },
{ act_security_scu_string, account_security_scu_handler, 0, 0 },
{ act_slots_string, account_slots_handler, 0, 0 },
{ act_parent_string, account_parent_handler, 0, 0 },
{ act_lots_string, account_lots_handler, 0, 0 },
/* These should not appear in newer xml files; only in old
* (circa gnucash-1.6) xml files. We maintain them for backward
* compatibility. */
{ act_currency_string, depricated_account_currency_handler, 0, 0 },
{ act_currency_scu_string, depricated_account_currency_scu_handler, 0, 0 },
{ act_security_string, depricated_account_security_handler, 0, 0 },
{ act_security_scu_string, depricated_account_security_scu_handler, 0, 0 },
{ NULL, 0, 0, 0 }
};
@ -405,3 +460,5 @@ gnc_account_sixtp_parser_create(void)
{
return sixtp_dom_parser_new(gnc_account_end_handler, NULL, NULL);
}
/* ====================== END OF FILE ===================*/

4
src/backend/file/gnc-lot-xml-v2.c
View File

@ -60,14 +60,14 @@ xmlNodePtr
gnc_lot_dom_tree_create(GNCLot *lot)
{
xmlNodePtr ret;
kvp_frame *kf;
kvp_frame *kf;
ret = xmlNewNode(NULL, gnc_lot_string);
xmlSetProp(ret, "version", lot_version_string);
xmlAddChild(ret, guid_to_dom_tree(lot_id_string, gnc_lot_get_guid(lot)));
kf = gnc_lot_get_slots (lot);
kf = gnc_lot_get_slots (lot);
if (kf)
{
xmlNodePtr kvpnode = kvp_frame_to_dom_tree(lot_slots_string, kf);

67
src/backend/file/gnc-transaction-xml-v2.c
View File

@ -1,6 +1,7 @@
/********************************************************************
* gnc-transactions-xml-v2.c -- xml routines for transactions *
* Copyright (C) 2001 Rob Browning *
* Copyright (C) 2002 Linas Vepstas <linas@linas.org> *
* *
* This program is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License as *
@ -44,6 +45,8 @@
#include "AccountP.h"
#include "Transaction.h"
#include "TransactionP.h"
#include "gnc-lot.h"
#include "gnc-lot-p.h"
const gchar *transaction_version_string = "2.0.0";
@ -106,19 +109,27 @@ split_to_dom_tree(const gchar *tag, Split *spl)
add_gnc_num(ret, "split:quantity", xaccSplitGetAmount(spl));
{
Account * account = xaccSplitGetAccount (spl);
Account * account = xaccSplitGetAccount (spl);
xmlAddChild (ret, guid_to_dom_tree("split:account",
xmlAddChild (ret, guid_to_dom_tree("split:account",
xaccAccountGetGUID (account)));
}
{
xmlNodePtr kvpnode = kvp_frame_to_dom_tree("split:slots",
xaccSplitGetSlots(spl));
if(kvpnode)
{
xmlAddChild(ret, kvpnode);
}
GNCLot * lot = xaccSplitGetLot (spl);
if (lot)
{
xmlAddChild (ret, guid_to_dom_tree("split:lot",
gnc_lot_get_guid(lot)));
}
}
{
xmlNodePtr kvpnode = kvp_frame_to_dom_tree("split:slots",
xaccSplitGetSlots(spl));
if(kvpnode)
{
xmlAddChild(ret, kvpnode);
}
}
return ret;
@ -127,16 +138,15 @@ split_to_dom_tree(const gchar *tag, Split *spl)
static void
add_trans_splits(xmlNodePtr node, Transaction *trn)
{
Split *mark;
int i;
GList *n;
xmlNodePtr toaddto;
toaddto = xmlNewChild(node, NULL, "trn:splits", NULL);
for(i = 0, mark = xaccTransGetSplit(trn, i); mark;
i++, mark = xaccTransGetSplit(trn, i))
for (n=xaccTransGetSplitList(trn); n; n=n->next)
{
xmlAddChild(toaddto, split_to_dom_tree("trn:split", mark));
Split *s = n->data;
xmlAddChild(toaddto, split_to_dom_tree("trn:split", s));
}
}
@ -319,6 +329,30 @@ spl_account_handler(xmlNodePtr node, gpointer data)
return TRUE;
}
static gboolean
spl_lot_handler(xmlNodePtr node, gpointer data)
{
struct split_pdata *pdata = data;
GUID *id = dom_tree_to_guid(node);
GNCLot *lot;
if (!id) return FALSE;
lot = gnc_lot_lookup (id, pdata->book);
if (!lot && gnc_transaction_xml_v2_testing &&
!guid_equal (id, xaccGUIDNULL ()))
{
lot = gnc_lot_new (pdata->book);
gnc_lot_set_guid (lot, *id);
}
gnc_lot_add_split (lot, pdata->split);
g_free(id);
return TRUE;
}
static gboolean
spl_slots_handler(xmlNodePtr node, gpointer data)
{
@ -342,6 +376,7 @@ struct dom_tree_handler spl_dom_handlers[] =
{ "split:value", spl_value_handler, 1, 0 },
{ "split:quantity", spl_quantity_handler, 1, 0 },
{ "split:account", spl_account_handler, 1, 0 },
{ "split:lot", spl_lot_handler, 0, 0 },
{ "split:slots", spl_slots_handler, 0, 0 },
{ NULL, NULL, 0, 0 },
};
@ -583,7 +618,7 @@ Transaction *
dom_tree_to_transaction( xmlNodePtr node, GNCBook *book )
{
Transaction *trn;
gboolean successful;
gboolean successful;
struct trans_pdata pdata;
g_return_val_if_fail(node, NULL);
@ -606,7 +641,7 @@ dom_tree_to_transaction( xmlNodePtr node, GNCBook *book )
xaccTransBeginEdit(trn);
xaccTransDestroy(trn);
xaccTransCommitEdit(trn);
trn = NULL;
trn = NULL;
}
return trn;