r16787 - gnucash/branches/gda-dev2/src - 1) Change order of arguments for object backend commit routine so that
Phil Longstaff
plongstaff at cvs.gnucash.org
Thu Jan 3 21:33:22 EST 2008
Author: plongstaff
Date: 2008-01-03 21:33:22 -0500 (Thu, 03 Jan 2008)
New Revision: 16787
Trac: http://svn.gnucash.org/trac/changeset/16787
Modified:
gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.h
gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h
gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.h
gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.h
gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c
gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.h
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.h
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c
gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c
gnucash/branches/gda-dev2/src/gnome-utils/Makefile.am
Log:
1) Change order of arguments for object backend commit routine so that
it can be called directly from some foreach() routines
2) Use qof logging macros
3) Fix incorrect function parameter check
4) Add LIBGDA_LIBS to gnome-utils/Makefile.am
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -270,7 +270,7 @@
/* ================================================================= */
void
-gnc_gda_save_account( GncGdaBackend* be, QofInstance* inst )
+gnc_gda_save_account( QofInstance* inst, GncGdaBackend* be )
{
Account* pAcc = GNC_ACCOUNT(inst);
const GUID* guid;
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.h 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-account-gda.h 2008-01-04 02:33:22 UTC (rev 16787)
@@ -33,6 +33,6 @@
#include <gmodule.h>
void gnc_gda_init_account_handler( void );
-void gnc_gda_save_account( GncGdaBackend* be, QofInstance* inst );
+void gnc_gda_save_account( QofInstance* inst, GncGdaBackend* be );
#endif /* GNC_ACCOUNT_GDA_H_ */
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -242,7 +242,7 @@
g_free( book_info );
if( be->pConnection == NULL ) {
- g_critical( "SQL error: %s\n", error->message );
+ PERR( "SQL error: %s\n", error->message );
qof_backend_set_error( be_start, ERR_BACKEND_NO_SUCH_DB );
LEAVE( " " );
@@ -256,7 +256,7 @@
gda_dict_set_connection( be->pDict, be->pConnection );
gda_dict_update_dbms_meta_data( be->pDict, 0, NULL, &error );
if( error != NULL ) {
- g_critical( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
+ PERR( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
}
// Call all object backends to create any required tables
@@ -265,7 +265,7 @@
// Update the dictionary because new tables may exist
gda_dict_update_dbms_meta_data( be->pDict, 0, NULL, &error );
if( error != NULL ) {
- g_critical( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
+ PERR( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
}
LEAVE (" ");
@@ -427,7 +427,7 @@
descendants = gnc_account_get_descendants( root );
for( node = descendants; node != NULL; node = g_list_next(node) ) {
- gnc_gda_save_account( be, QOF_INSTANCE(GNC_ACCOUNT(node->data)) );
+ gnc_gda_save_account( QOF_INSTANCE(GNC_ACCOUNT(node->data)), be );
}
g_list_free( descendants );
}
@@ -448,7 +448,7 @@
g_return_val_if_fail( tx != NULL, 0 );
g_return_val_if_fail( data != NULL, 0 );
- gnc_gda_save_transaction( be, QOF_INSTANCE(tx) );
+ gnc_gda_save_transaction( QOF_INSTANCE(tx), be );
return 0;
}
@@ -489,7 +489,7 @@
for( ; schedXactions != NULL; schedXactions = schedXactions->next ) {
tmpSX = schedXactions->data;
- gnc_gda_save_schedxaction( be, QOF_INSTANCE( tmpSX ) );
+ gnc_gda_save_schedxaction( QOF_INSTANCE( tmpSX ), be );
}
}
@@ -527,7 +527,7 @@
NULL,
&error );
if( error != NULL ) {
- g_critical( "SQL error: %s\n", error->message );
+ PERR( "SQL error: %s\n", error->message );
}
numTables = gda_data_model_get_n_rows( tables );
for( row = 0; row < numTables; row++ ) {
@@ -538,9 +538,9 @@
table_name = g_value_get_string( row_value );
error = NULL;
if( !gda_drop_table( be->pConnection, table_name, &error ) ) {
- g_critical( "Unable to drop table %s\n", table_name );
+ PERR( "Unable to drop table %s\n", table_name );
if( error != NULL ) {
- g_critical( "SQL error: %s\n", error->message );
+ PERR( "SQL error: %s\n", error->message );
}
}
}
@@ -548,7 +548,7 @@
// Update the dictionary because new tables may exist
gda_dict_update_dbms_meta_data( be->pDict, 0, NULL, &error );
if( error != NULL ) {
- g_critical( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
+ PERR( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
}
/* Create new tables */
@@ -557,12 +557,13 @@
// Update the dictionary because new tables may exist
gda_dict_update_dbms_meta_data( be->pDict, 0, NULL, &error );
if( error != NULL ) {
- g_critical( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
+ PERR( "gda_dict_update_dbms_meta_data() error: %s\n", error->message );
}
/* Save all contents */
+ be->primary_book = book;
//write_commodities( be, book );
- gnc_gda_save_book( be, QOF_INSTANCE(book) );
+ gnc_gda_save_book( QOF_INSTANCE(book), be );
write_accounts( be );
write_transactions( be );
write_template_transactions( be );
@@ -604,7 +605,7 @@
g_return_if_fail( !be_data->ok );
if( pData->commit != NULL ) {
- (pData->commit)( be_data->be, be_data->inst );
+ (pData->commit)( be_data->inst, be_data->be );
be_data->ok = TRUE;
}
}
@@ -631,7 +632,7 @@
ENTER( " " );
- g_debug( "gda_commit_edit(): %s dirty = %d, do_free=%d\n",
+ DEBUG( "gda_commit_edit(): %s dirty = %d, do_free=%d\n",
(inst->e_type ? inst->e_type : "(null)"),
qof_instance_get_dirty_flag(inst), qof_instance_get_destroying(inst) );
@@ -648,9 +649,9 @@
GDA_TRANSACTION_ISOLATION_UNKNOWN, &error );
if( !status ) {
if( error != NULL ) {
- g_warning( "Unable to begin transaction: %s\n", error->message );
+ PWARN( "Unable to begin transaction: %s\n", error->message );
} else {
- g_warning( "Unable to begin transaction\n" );
+ PWARN( "Unable to begin transaction\n" );
}
}
}
@@ -661,14 +662,14 @@
qof_object_foreach_backend( GNC_GDA_BACKEND, commit_cb, &be_data );
if( !be_data.ok ) {
- g_critical( "gnc_gda_commit_edit(): Unknown object type '%s'\n", inst->e_type );
+ PERR( "gnc_gda_commit_edit(): Unknown object type '%s'\n", inst->e_type );
if( be->supports_transactions ) {
status = gda_connection_rollback_transaction( be->pConnection, TRANSACTION_NAME, &error );
if( !status ) {
if( error != NULL ) {
- g_warning( "Unable to roll back transaction: %s\n", error->message );
+ PWARN( "Unable to roll back transaction: %s\n", error->message );
} else {
- g_warning( "Unable to roll back transaction\n" );
+ PWARN( "Unable to roll back transaction\n" );
}
}
}
@@ -678,9 +679,9 @@
status = gda_connection_commit_transaction( be->pConnection, TRANSACTION_NAME, &error );
if( !status ) {
if( error != NULL ) {
- g_warning( "Unable to commit transaction: %s\n", error->message );
+ PWARN( "Unable to commit transaction: %s\n", error->message );
} else {
- g_warning( "Unable to commit transaction\n" );
+ PWARN( "Unable to commit transaction\n" );
}
}
}
@@ -870,7 +871,7 @@
}
}
- g_debug( "Compiled: %s\n", sql );
+ DEBUG( "Compiled: %s\n", sql );
pQueryInfo->pCompiledQuery = g_strdup( sql );
LEAVE( "" );
@@ -919,7 +920,7 @@
return;
}
- g_debug( "gda_free_query(): %s\n", (gchar*)pQueryInfo->pCompiledQuery );
+ DEBUG( "gda_free_query(): %s\n", (gchar*)pQueryInfo->pCompiledQuery );
g_free( pQueryInfo->pCompiledQuery );
g_free( pQueryInfo );
@@ -981,7 +982,7 @@
// Mark the book as clean
qof_instance_mark_clean( QOF_INSTANCE(be->primary_book) );
-// g_debug( "gda_run_query(): %s\n", (gchar*)pQueryInfo->pCompiledQuery );
+// DEBUG( "gda_run_query(): %s\n", (gchar*)pQueryInfo->pCompiledQuery );
LEAVE( "" );
}
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -41,6 +41,8 @@
#include "gnc-backend-util-gda.h"
#include "gnc-gconf-utils.h"
+static QofLogModule log_module = GNC_MOD_BACKEND;
+
typedef struct {
QofIdType searchObj;
gpointer pCompiledQuery;
@@ -888,7 +890,7 @@
(*setter)( pObject, &ts );
}
} else {
- g_warning( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
+ PWARN( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
}
}
}
@@ -1012,7 +1014,7 @@
g_date_free( date );
}
} else {
- g_warning( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
+ PWARN( "Unknown timespec type: %s", G_VALUE_TYPE_NAME( val ) );
}
}
}
@@ -1094,7 +1096,7 @@
} else if( G_VALUE_HOLDS_UINT64(value) ) {
return g_value_get_uint64( value );
} else {
- g_warning( "Unknown type: %s", G_VALUE_TYPE_NAME( value ) );
+ PWARN( "Unknown type: %s", G_VALUE_TYPE_NAME( value ) );
}
return 0;
@@ -1291,6 +1293,7 @@
}
g_hash_table_insert( g_columnTypeHash, (gpointer)colType, (gpointer)handler );
+ DEBUG( "Col type %s registered\n", colType );
}
static col_type_handler_t*
@@ -1298,7 +1301,7 @@
{
col_type_handler_t* pHandler;
- g_return_val_if_fail( pHandler != NULL, NULL );
+ g_return_val_if_fail( col_type != NULL, NULL );
pHandler = g_hash_table_lookup( g_columnTypeHash, col_type );
if( pHandler == NULL ) {
@@ -1451,7 +1454,7 @@
ret = gda_query_execute( query, NULL, FALSE, &error );
if( error != NULL ) {
- g_critical( "SQL error: %s\n", error->message );
+ PERR( "SQL error: %s\n", error->message );
}
return ret;
@@ -1468,7 +1471,7 @@
query = gda_query_new_from_sql( be->pDict, sql, &error );
if( query == NULL ) {
- g_critical( "SQL error: %s\n", error->message );
+ PERR( "SQL error: %s\n", error->message );
}
return query;
@@ -1507,7 +1510,7 @@
}
if( error != NULL ) {
- g_critical( "SQL error: %s\n", error->message );
+ PERR( "SQL error: %s\n", error->message );
}
return count;
@@ -1880,7 +1883,7 @@
if( !GDA_IS_DICT_TABLE(table) ) {
gnc_gda_create_table( be->pConnection, table_name, col_table, &error );
if( error != NULL ) {
- g_critical( "Error creating table: %s\n", error->message );
+ PERR( "Error creating table: %s\n", error->message );
}
}
}
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-backend-util-gda.h 2008-01-04 02:33:22 UTC (rev 16787)
@@ -56,6 +56,10 @@
* commit() - commit an object to the db
* initial_load() - load stuff when new db opened
* create_tables() - create any db tables
+ * compile_query() - compile a backend object query
+ * run_query() - run a compiled query
+ * free_query() - free a compiled query
+ * write() - write all objects
*/
#define GNC_GDA_BACKEND "gnc:gda:1"
#define GNC_GDA_BACKEND_VERSION 1
@@ -64,7 +68,7 @@
int version; /* backend version number */
const gchar * type_name; /* The XML tag for this type */
- void (*commit)( GncGdaBackend* pBackend, QofInstance* inst );
+ void (*commit)( QofInstance* inst, GncGdaBackend* be );
void (*initial_load)( GncGdaBackend* pBackend );
void (*create_tables)( GncGdaBackend* pBackend );
gpointer (*compile_query)( GncGdaBackend* pBackend, QofQuery* pQuery );
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -169,7 +169,7 @@
// If there are no rows, try committing the book
if( numRows == 0 ) {
- gnc_gda_save_book( be, QOF_INSTANCE(be->primary_book) );
+ gnc_gda_save_book( QOF_INSTANCE(be->primary_book), be );
} else {
// Otherwise, load the 1st book.
load_single_book( be, pModel, 0 );
@@ -188,7 +188,7 @@
/* ================================================================= */
void
-gnc_gda_save_book( GncGdaBackend* be, QofInstance* inst )
+gnc_gda_save_book( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.h 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-book-gda.h 2008-01-04 02:33:22 UTC (rev 16787)
@@ -33,6 +33,6 @@
#include <gmodule.h>
void gnc_gda_init_book_handler( void );
-void gnc_gda_save_book( GncGdaBackend* be, QofInstance* inst );
+void gnc_gda_save_book( QofInstance* inst, GncGdaBackend* be );
#endif /* GNC_BOOK_GDA_H_ */
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-budget-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -123,7 +123,7 @@
/* ================================================================= */
static void
-save_budget( GncGdaBackend* be, QofInstance* inst )
+save_budget( QofInstance* inst, GncGdaBackend* be )
{
GncBudget* pBudget = GNC_BUDGET(inst);
const GUID* guid;
@@ -150,24 +150,12 @@
}
static void
-write_budget( QofInstance* ent, gpointer data )
-{
- GncGdaBackend* be = (GncGdaBackend*)data;
-
- g_return_if_fail( data != NULL );
- g_return_if_fail( ent != NULL );
- g_return_if_fail( GNC_IS_BUDGET(ent) );
-
- save_budget( be, ent );
-}
-
-static void
write_budgets( GncGdaBackend* be )
{
g_return_if_fail( be != NULL );
qof_collection_foreach( qof_book_get_collection( be->primary_book, GNC_ID_BUDGET ),
- write_budget, be );
+ (QofInstanceForeachCB)save_budget, be );
}
/* ================================================================= */
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-commodity-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -175,7 +175,7 @@
/* ================================================================= */
static void
-commit_commodity( GncGdaBackend* be, QofInstance* inst )
+commit_commodity( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
@@ -217,7 +217,7 @@
g_return_if_fail( pCommodity != NULL );
if( !is_commodity_in_db( be, pCommodity ) ) {
- commit_commodity( be, QOF_INSTANCE(pCommodity) );
+ commit_commodity( QOF_INSTANCE(pCommodity), be );
}
}
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-lots-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -151,7 +151,7 @@
/* ================================================================= */
static void
-commit_lot( GncGdaBackend* be, QofInstance* inst )
+commit_lot( QofInstance* inst, GncGdaBackend* be )
{
g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-price-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -122,7 +122,7 @@
/* ================================================================= */
static void
-save_price( GncGdaBackend* be, QofInstance* inst )
+save_price( QofInstance* inst, GncGdaBackend* be )
{
GNCPrice* pPrice = GNC_PRICE(inst);
@@ -149,7 +149,7 @@
g_return_val_if_fail( p != NULL, FALSE );
g_return_val_if_fail( data != NULL, FALSE );
- save_price( be, QOF_INSTANCE(p) );
+ save_price( QOF_INSTANCE(p), be );
return TRUE;
}
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -235,14 +235,14 @@
/* ================================================================= */
void
-gnc_gda_save_schedxaction( GncGdaBackend* be, QofInstance* inst )
+gnc_gda_save_schedxaction( QofInstance* inst, GncGdaBackend* be )
{
SchedXaction* pSx = GNC_SX(inst);
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_SX(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.h 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-schedxaction-gda.h 2008-01-04 02:33:22 UTC (rev 16787)
@@ -33,6 +33,6 @@
#include <gmodule.h>
void gnc_gda_init_schedxaction_handler( void );
-void gnc_gda_save_schedxaction( GncGdaBackend* be, QofInstance* inst );
+void gnc_gda_save_schedxaction( QofInstance* inst, GncGdaBackend* be );
#endif /* GNC_SCHEDXACTION_GDA_H_ */
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -451,10 +451,10 @@
}
static void
-commit_split( GncGdaBackend* be, QofInstance* inst )
+commit_split( QofInstance* inst, GncGdaBackend* be )
{
+ g_return_if_fail( inst != NULL );
g_return_if_fail( be != NULL );
- g_return_if_fail( inst != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
@@ -476,7 +476,7 @@
g_return_if_fail( GNC_IS_SPLIT(data) );
g_return_if_fail( user_data != NULL );
- commit_split( split_info->be, QOF_INSTANCE(pSplit) );
+ commit_split( QOF_INSTANCE(pSplit), split_info->be );
}
static void
@@ -494,14 +494,14 @@
}
void
-gnc_gda_save_transaction( GncGdaBackend* be, QofInstance* inst )
+gnc_gda_save_transaction( QofInstance* inst, GncGdaBackend* be )
{
Transaction* pTx = GNC_TRANS(inst);
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_TRANS(inst) );
+ g_return_if_fail( be != NULL );
// Ensure the commodity is in the db
gnc_gda_save_commodity( be, xaccTransGetCurrency( pTx ) );
Modified: gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.h 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/backend/gda/gnc-transaction-gda.h 2008-01-04 02:33:22 UTC (rev 16787)
@@ -34,7 +34,7 @@
void gnc_gda_init_transaction_handler( void );
void gnc_gda_transaction_commit_splits( GncGdaBackend* be, Transaction* pTx );
-void gnc_gda_save_transaction( GncGdaBackend* be, QofInstance* inst );
+void gnc_gda_save_transaction( QofInstance* inst, GncGdaBackend* be );
void gnc_gda_get_account_balances( GncGdaBackend* be, Account* pAccount,
gnc_numeric* start_balance,
gnc_numeric* cleared_balance,
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -137,23 +137,11 @@
/* ================================================================= */
static void
-write_single_billterm( QofInstance *term_p, gpointer be_p )
-{
- GncGdaBackend* be = (GncGdaBackend*)be_p;
-
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_BILLTERM(term_p) );
- g_return_if_fail( be_p != NULL );
-
- gnc_gda_save_billterm( be, term_p );
-}
-
-static void
write_billterms( GncGdaBackend* be )
{
g_return_if_fail( be != NULL );
- qof_object_foreach( GNC_ID_BILLTERM, be->primary_book, write_single_billterm, (gpointer)be );
+ qof_object_foreach( GNC_ID_BILLTERM, be->primary_book, (QofInstanceForeachCB)gnc_gda_save_billterm, (gpointer)be );
}
/* ================================================================= */
@@ -167,13 +155,13 @@
/* ================================================================= */
void
-gnc_gda_save_billterm( GncGdaBackend* be, QofInstance* inst )
+gnc_gda_save_billterm( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( !GNC_IS_BILLTERM(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.h
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.h 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-bill-term-gda.h 2008-01-04 02:33:22 UTC (rev 16787)
@@ -35,6 +35,6 @@
#define CT_BILLTERMREF "billterm"
void gnc_billterm_gda_initialize( void );
-void gnc_gda_save_billterm( GncGdaBackend* be, QofInstance* inst );
+void gnc_gda_save_billterm( QofInstance* inst, GncGdaBackend* be );
#endif /* GNC_BILLTERM_GDA_H */
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-customer-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -135,13 +135,13 @@
/* ================================================================= */
static void
-save_customer( GncGdaBackend* be, QofInstance* inst )
+save_customer( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_CUSTOMER(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
@@ -185,7 +185,7 @@
g_return_if_fail( be_p != NULL );
if( customer_should_be_saved( GNC_CUSTOMER(term_p) ) ) {
- save_customer( be, term_p );
+ save_customer( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-employee-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -136,14 +136,14 @@
/* ================================================================= */
static void
-save_employee( GncGdaBackend* be, QofInstance* inst )
+save_employee( QofInstance* inst, GncGdaBackend* be )
{
GncEmployee* emp = GNC_EMPLOYEE(inst);
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_EMPLOYEE(inst) );
+ g_return_if_fail( be != NULL );
// Ensure the commodity is in the db
gnc_gda_save_commodity( be, gncEmployeeGetCurrency( emp ) );
@@ -189,7 +189,7 @@
g_return_if_fail( be_p != NULL );
if( employee_should_be_saved( GNC_EMPLOYEE(term_p) ) ) {
- save_employee( be, term_p );
+ save_employee( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-entry-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -148,13 +148,13 @@
/* ================================================================= */
static void
-save_entry( GncGdaBackend* be, QofInstance* inst )
+save_entry( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_ENTRY(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
@@ -185,7 +185,7 @@
/* Only save if attached */
if( gncEntryGetOrder( entry ) != NULL || gncEntryGetInvoice( entry ) != NULL ||
gncEntryGetBill( entry ) != NULL ) {
- save_entry( be, term_p );
+ save_entry( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-invoice-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -138,14 +138,14 @@
/* ================================================================= */
static void
-save_invoice( GncGdaBackend* be, QofInstance* inst )
+save_invoice( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
GncInvoice* invoice = GNC_INVOICE(inst);
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_INVOICE(inst) );
+ g_return_if_fail( be != NULL );
// Ensure the commodity is in the db
gnc_gda_save_commodity( be, gncInvoiceGetCurrency( invoice ) );
@@ -192,7 +192,7 @@
g_return_if_fail( be_p != NULL );
if( invoice_should_be_saved( GNC_INVOICE(term_p) ) ) {
- save_invoice( be, term_p );
+ save_invoice( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-job-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -122,13 +122,13 @@
/* ================================================================= */
static void
-save_job( GncGdaBackend* be, QofInstance* inst )
+save_job( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_JOB(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
@@ -172,7 +172,7 @@
g_return_if_fail( be_p != NULL );
if( job_should_be_saved( GNC_JOB(term_p) ) ) {
- save_job( be, term_p );
+ save_job( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-order-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -123,13 +123,13 @@
/* ================================================================= */
static void
-save_order( GncGdaBackend* be, QofInstance* inst )
+save_order( QofInstance* inst, GncGdaBackend* be )
{
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_ORDER(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
@@ -173,7 +173,7 @@
g_return_if_fail( be_p != NULL );
if( order_should_be_saved( GNC_ORDER(term_p) ) ) {
- save_order( be, term_p );
+ save_order( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-tax-table-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -298,14 +298,14 @@
}
static void
-save_taxtable( GncGdaBackend* be, QofInstance* inst )
+save_taxtable( QofInstance* inst, GncGdaBackend* be )
{
GncTaxTable* tt = GNC_TAXTABLE(inst);
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_TAXTABLE(inst) );
+ g_return_if_fail( be != NULL );
(void)gnc_gda_do_db_operation( be,
(qof_instance_get_destroying(inst) ? OP_DB_DELETE : OP_DB_ADD_OR_UPDATE ),
@@ -326,23 +326,11 @@
/* ================================================================= */
static void
-write_single_taxtable( QofInstance *term_p, gpointer be_p )
-{
- GncGdaBackend* be = (GncGdaBackend*)be_p;
-
- g_return_if_fail( term_p != NULL );
- g_return_if_fail( GNC_IS_TAXTABLE(term_p) );
- g_return_if_fail( be_p != NULL );
-
- save_taxtable( be, term_p );
-}
-
-static void
write_taxtables( GncGdaBackend* be )
{
g_return_if_fail( be != NULL );
- qof_object_foreach( GNC_ID_TAXTABLE, be->primary_book, write_single_taxtable, (gpointer)be );
+ qof_object_foreach( GNC_ID_TAXTABLE, be->primary_book, (QofInstanceForeachCB)save_taxtable, (gpointer)be );
}
/* ================================================================= */
Modified: gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c
===================================================================
--- gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/business/business-core/gda/gnc-vendor-gda.c 2008-01-04 02:33:22 UTC (rev 16787)
@@ -135,14 +135,14 @@
/* ================================================================= */
static void
-save_vendor( GncGdaBackend* be, QofInstance* inst )
+save_vendor( QofInstance* inst, GncGdaBackend* be )
{
GncVendor* v = GNC_VENDOR(inst);
const GUID* guid;
- g_return_if_fail( be != NULL );
g_return_if_fail( inst != NULL );
g_return_if_fail( GNC_IS_VENDOR(inst) );
+ g_return_if_fail( be != NULL );
// Ensure the commodity is in the db
gnc_gda_save_commodity( be, gncVendorGetCurrency( v ) );
@@ -189,7 +189,7 @@
g_return_if_fail( be_p != NULL );
if( vendor_should_be_saved( GNC_VENDOR(term_p) ) ) {
- save_vendor( be, term_p );
+ save_vendor( term_p, be );
}
}
Modified: gnucash/branches/gda-dev2/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/gda-dev2/src/gnome-utils/Makefile.am 2008-01-03 20:40:24 UTC (rev 16786)
+++ gnucash/branches/gda-dev2/src/gnome-utils/Makefile.am 2008-01-04 02:33:22 UTC (rev 16787)
@@ -196,7 +196,8 @@
${QOF_LIBS} \
${GOFFICE_LIBS} \
${REGEX_LIBS} \
- ${LIBXML2_LIBS}
+ ${LIBXML2_LIBS} \
+ ${LIBGDA_LIBS}
if BUILDING_FROM_SVN
swig-gnome-utils.c: gnome-utils.i gnc-html.h \
More information about the gnucash-changes
mailing list