r16695 - gnucash/branches/gda-dev/src - 1) Convert column types from int to gchar* so that new ones can be added
Phil Longstaff
plongstaff at cvs.gnucash.org
Sat Dec 22 13:18:37 EST 2007
Author: plongstaff
Date: 2007-12-22 13:18:37 -0500 (Sat, 22 Dec 2007)
New Revision: 16695
Trac: http://svn.gnucash.org/trac/changeset/16695
Modified:
gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c
gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h
gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c
gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c
gnucash/branches/gda-dev/src/business/business-core/gda/gnc-customer-gda.c
gnucash/branches/gda-dev/src/business/business-core/gda/gnc-employee-gda.c
gnucash/branches/gda-dev/src/business/business-core/gda/gnc-invoice-gda.c
gnucash/branches/gda-dev/src/business/business-core/gda/gnc-job-gda.c
gnucash/branches/gda-dev/src/business/business-core/gda/gnc-vendor-gda.c
Log:
1) Convert column types from int to gchar* so that new ones can be added
easily without needing a central reference.
2) Make lots of pointers 'const'
Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -58,13 +58,13 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
- { "account_type", CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
- { "commodity_guid", CT_GUID_C, 0, COL_NNUL, "commodity" },
- { "parent_guid", CT_GUID, 0, 0, NULL, NULL, get_parent, set_parent },
- { "code", CT_STRING, ACCOUNT_MAX_CODE_LEN, 0, "code" },
- { "description", CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "name", CT_STRING, ACCOUNT_MAX_NAME_LEN, COL_NNUL, "name" },
+ { "account_type", CT_STRING, ACCOUNT_MAX_TYPE_LEN, COL_NNUL, NULL, ACCOUNT_TYPE_ },
+ { "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, "commodity" },
+ { "parent_guid", CT_GUID, 0, 0, NULL, NULL, get_parent, set_parent },
+ { "code", CT_STRING, ACCOUNT_MAX_CODE_LEN, 0, "code" },
+ { "description", CT_STRING, ACCOUNT_MAX_DESCRIPTION_LEN, 0, "description" },
{ NULL }
};
static col_cvt_t parent_col_table[] =
Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -148,7 +148,7 @@
}
static void
-load_string( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_string( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -169,8 +169,8 @@
}
static void
-get_gvalue_string( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GValue* value )
+get_gvalue_string( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GValue* value )
{
QofAccessFunc getter;
gchar* s;
@@ -189,8 +189,8 @@
}
static void
-get_gvalue_string_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_string_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -199,8 +199,8 @@
}
static GdaQueryCondition*
-get_gvalue_string_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_string_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -227,7 +227,7 @@
/* ----------------------------------------------------------------- */
static void
-load_int( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_int( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -248,8 +248,8 @@
}
static void
-get_gvalue_int( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GValue* value )
+get_gvalue_int( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GValue* value )
{
gint int_value;
QofAccessFunc getter;
@@ -263,8 +263,8 @@
}
static void
-get_gvalue_int_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_int_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -273,8 +273,8 @@
}
static GdaQueryCondition*
-get_gvalue_int_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_int_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -300,7 +300,7 @@
/* ----------------------------------------------------------------- */
static void
-load_boolean( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_boolean( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -321,8 +321,8 @@
}
static void
-get_gvalue_boolean( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GValue* value )
+get_gvalue_boolean( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GValue* value )
{
gint int_value;
QofAccessFunc getter;
@@ -336,8 +336,8 @@
}
static void
-get_gvalue_boolean_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_boolean_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -346,8 +346,8 @@
}
static GdaQueryCondition*
-get_gvalue_boolean_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_boolean_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -373,7 +373,7 @@
/* ----------------------------------------------------------------- */
static void
-load_int64( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_int64( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -390,7 +390,7 @@
}
static void
-get_gvalue_int64( GncGdaBackend* be, QofIdTypeConst obj_name, gpointer pObject,
+get_gvalue_int64( const GncGdaBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GValue* value )
{
gint64* pInt64;
@@ -408,8 +408,8 @@
}
static void
-get_gvalue_int64_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_int64_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -418,8 +418,8 @@
}
static GdaQueryCondition*
-get_gvalue_int64_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_int64_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -445,7 +445,7 @@
/* ----------------------------------------------------------------- */
static void
-load_double( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_double( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -462,7 +462,7 @@
}
static void
-get_gvalue_double( GncGdaBackend* be, QofIdTypeConst obj_name, gpointer pObject,
+get_gvalue_double( const GncGdaBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GValue* value )
{
QofAccessFunc getter;
@@ -481,8 +481,8 @@
}
static void
-get_gvalue_double_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_double_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -491,8 +491,8 @@
}
static GdaQueryCondition*
-get_gvalue_double_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_double_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -518,7 +518,7 @@
/* ----------------------------------------------------------------- */
static void
-load_guid( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_guid( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -541,7 +541,7 @@
}
static void
-get_gvalue_guid( GncGdaBackend* be, QofIdTypeConst obj_name, gpointer pObject,
+get_gvalue_guid( const GncGdaBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GValue* value )
{
QofAccessFunc getter;
@@ -564,8 +564,8 @@
}
static void
-get_gvalue_guid_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_guid_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -574,8 +574,8 @@
}
static GdaQueryCondition*
-get_gvalue_guid_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_guid_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -597,7 +597,7 @@
/* ----------------------------------------------------------------- */
static void
-get_gvalue_objectref_guid( GncGdaBackend* be, QofIdTypeConst obj_name, gpointer pObject,
+get_gvalue_objectref_guid( const GncGdaBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GValue* value )
{
QofAccessFunc getter;
@@ -624,8 +624,8 @@
}
void
-gnc_gda_get_gvalue_objectref_guid_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+gnc_gda_get_gvalue_objectref_guid_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -634,8 +634,8 @@
}
GdaQueryCondition*
-gnc_gda_get_gvalue_objectref_guid_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+gnc_gda_get_gvalue_objectref_guid_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -652,7 +652,7 @@
}
static void
-load_account_guid( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_account_guid( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -684,7 +684,7 @@
/* ----------------------------------------------------------------- */
static void
-load_commodity_guid( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_commodity_guid( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -716,7 +716,7 @@
/* ----------------------------------------------------------------- */
static void
-load_tx_guid( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_tx_guid( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -747,7 +747,7 @@
gnc_gda_get_gvalue_objectref_guid_for_query, gnc_gda_get_gvalue_objectref_guid_cond };
/* ----------------------------------------------------------------- */
static void
-load_timespec( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_timespec( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -785,8 +785,8 @@
}
static void
-get_gvalue_timespec( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GValue* value )
+get_gvalue_timespec( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GValue* value )
{
QofAccessFunc getter;
Timespec* pTimespec;
@@ -810,8 +810,8 @@
}
static void
-get_gvalue_timespec_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_timespec_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -820,8 +820,8 @@
}
static GdaQueryCondition*
-get_gvalue_timespec_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_timespec_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -846,7 +846,7 @@
get_gvalue_timespec_for_query, get_gvalue_timespec_cond };
/* ----------------------------------------------------------------- */
static void
-load_date( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_date( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -882,7 +882,7 @@
}
static void
-get_gvalue_date( GncGdaBackend* be, QofIdTypeConst obj_name, gpointer pObject,
+get_gvalue_date( const GncGdaBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GValue* value )
{
GDate* date;
@@ -899,8 +899,8 @@
}
static void
-get_gvalue_date_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_date_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -909,8 +909,8 @@
}
static GdaQueryCondition*
-get_gvalue_date_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_date_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
@@ -945,10 +945,10 @@
}
typedef void (*NumericSetterFunc)( gpointer, gnc_numeric );
-typedef gnc_numeric (*NumericGetterFunc)( gpointer );
+typedef gnc_numeric (*NumericGetterFunc)( const gpointer );
static void
-load_numeric( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+load_numeric( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table )
{
@@ -984,7 +984,7 @@
}
static void
-get_gvalue_numeric( GncGdaBackend* be, QofIdTypeConst obj_name, gpointer pObject,
+get_gvalue_numeric( const GncGdaBackend* be, QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GValue* value )
{
NumericGetterFunc getter;
@@ -999,8 +999,8 @@
}
static void
-get_gvalue_numeric_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_numeric_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
GValue num_value;
@@ -1030,8 +1030,8 @@
}
static GdaQueryCondition*
-get_gvalue_numeric_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
+get_gvalue_numeric_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query )
{
GValue value;
GValue num_value;
@@ -1096,21 +1096,21 @@
static GHashTable* g_columnTypeHash = NULL;
void
-gnc_gda_register_column_handler( gint colType, col_type_handler_t* handler )
+gnc_gda_register_column_handler( const gchar* colType, const col_type_handler_t* handler )
{
if( g_columnTypeHash == NULL ) {
- g_columnTypeHash = g_hash_table_new( g_direct_hash, g_direct_equal );
+ g_columnTypeHash = g_hash_table_new( g_str_hash, g_str_equal );
}
- g_hash_table_insert( g_columnTypeHash, GINT_TO_POINTER(colType), handler );
+ g_hash_table_insert( g_columnTypeHash, (gpointer)colType, (gpointer)handler );
}
static col_type_handler_t*
-get_handler( gint col_type )
+get_handler( const gchar* col_type )
{
col_type_handler_t* pHandler;
- pHandler = g_hash_table_lookup( g_columnTypeHash, GINT_TO_POINTER(col_type) );
+ pHandler = g_hash_table_lookup( g_columnTypeHash, col_type );
if( pHandler == NULL ) {
g_assert( FALSE );
}
@@ -1127,9 +1127,9 @@
gnc_gda_register_column_handler( CT_INT64, &int64_handler );
gnc_gda_register_column_handler( CT_DOUBLE, &double_handler );
gnc_gda_register_column_handler( CT_GUID, &guid_handler );
- gnc_gda_register_column_handler( CT_GUID_A, &account_guid_handler );
- gnc_gda_register_column_handler( CT_GUID_C, &commodity_guid_handler );
- gnc_gda_register_column_handler( CT_GUID_T, &tx_guid_handler );
+ gnc_gda_register_column_handler( CT_ACCOUNTREF, &account_guid_handler );
+ gnc_gda_register_column_handler( CT_COMMODITYREF, &commodity_guid_handler );
+ gnc_gda_register_column_handler( CT_TXREF, &tx_guid_handler );
gnc_gda_register_column_handler( CT_TIMESPEC, ×pec_handler );
gnc_gda_register_column_handler( CT_GDATE, &date_handler );
gnc_gda_register_column_handler( CT_NUMERIC, &numeric_handler );
@@ -1155,7 +1155,7 @@
};
const GUID*
-gnc_gda_load_guid( GncGdaBackend* be, GdaDataModel* pModel, gint row )
+gnc_gda_load_guid( const GncGdaBackend* be, GdaDataModel* pModel, gint row )
{
static GUID guid;
@@ -1172,7 +1172,7 @@
};
const GUID*
-gnc_gda_load_tx_guid( GncGdaBackend* be, GdaDataModel* pModel, gint row )
+gnc_gda_load_tx_guid( const GncGdaBackend* be, GdaDataModel* pModel, gint row )
{
static GUID guid;
@@ -1182,7 +1182,7 @@
}
void
-gnc_gda_load_object( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+gnc_gda_load_object( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofIdTypeConst obj_name, gpointer pObject,
const col_cvt_t* table )
{
@@ -1230,7 +1230,7 @@
/* ================================================================= */
GdaObject*
-gnc_gda_execute_query( GncGdaBackend* be, GdaQuery* query )
+gnc_gda_execute_query( const GncGdaBackend* be, GdaQuery* query )
{
GError* error = NULL;
@@ -1246,7 +1246,7 @@
}
GdaQuery*
-gnc_gda_create_query_from_sql( GncGdaBackend* be, const gchar* sql )
+gnc_gda_create_query_from_sql( const GncGdaBackend* be, const gchar* sql )
{
GError* error = NULL;
@@ -1261,7 +1261,7 @@
}
GdaObject*
-gnc_gda_execute_sql( GncGdaBackend* be, const gchar* sql )
+gnc_gda_execute_sql( const GncGdaBackend* be, const gchar* sql )
{
GdaQuery* query;
@@ -1274,7 +1274,7 @@
}
int
-gnc_gda_execute_select_get_count( GncGdaBackend* be, const gchar* sql )
+gnc_gda_execute_select_get_count( const GncGdaBackend* be, const gchar* sql )
{
GError* error = NULL;
int count = 0;
@@ -1295,7 +1295,7 @@
}
int
-gnc_gda_execute_query_get_count( GncGdaBackend* be, GdaQuery* query )
+gnc_gda_execute_query_get_count( const GncGdaBackend* be, GdaQuery* query )
{
int count = 0;
@@ -1322,7 +1322,7 @@
}
static void
-get_col_gvalue_for_condition( GncGdaBackend* be, QofIdTypeConst obj_name,
+get_col_gvalue_for_condition( const GncGdaBackend* be, QofIdTypeConst obj_name,
gpointer pObject, const col_cvt_t* table_row,
GdaQuery* query )
{
@@ -1337,7 +1337,7 @@
}
gboolean
-gnc_gda_object_is_it_in_db( GncGdaBackend* be, const gchar* table_name,
+gnc_gda_object_is_it_in_db( const GncGdaBackend* be, const gchar* table_name,
QofIdTypeConst obj_name, gpointer pObject,
const col_cvt_t* table )
{
@@ -1513,7 +1513,7 @@
gboolean
gnc_gda_create_table( GdaConnection* cnn, const gchar* table_name,
- col_cvt_t* col_table, GError** error )
+ const col_cvt_t* col_table, GError** error )
{
GdaServerOperation *op;
GdaServerProvider *server;
@@ -1592,8 +1592,9 @@
return TRUE;
}
-void gnc_gda_create_table_if_needed( GncGdaBackend* be,
- const gchar* table_name, col_cvt_t* col_table )
+void gnc_gda_create_table_if_needed( const GncGdaBackend* be,
+ const gchar* table_name,
+ const col_cvt_t* col_table )
{
GdaDictTable* table;
GError* error = NULL;
Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.h 2007-12-22 18:18:37 UTC (rev 16695)
@@ -70,28 +70,23 @@
void (*free_query)( GncGdaBackend* pBackend, gpointer pQuery );
} GncGdaDataType_t;
-// This is now a static inside the module
-//QofBackend * libgncmod_backend_gda_LTX_gnc_backend_new(void);
-
// Type for conversion of db row to object.
-typedef enum {
- CT_STRING = -1,
- CT_GUID = -2,
- CT_INT = -3,
- CT_INT64 = -4,
- CT_TIMESPEC = -5,
- CT_GDATE = -6,
- CT_NUMERIC = -7,
- CT_DOUBLE = -8,
- CT_BOOLEAN = -9,
- CT_GUID_A = -10,
- CT_GUID_C = -11,
- CT_GUID_T = -12
-} E_COL_TYPE;
+#define CT_STRING "ct_string"
+#define CT_GUID "ct_guid"
+#define CT_INT "ct_int"
+#define CT_INT64 "ct_int64"
+#define CT_TIMESPEC "ct_timespec"
+#define CT_GDATE "ct_gdate"
+#define CT_NUMERIC "ct_numeric"
+#define CT_DOUBLE "ct_double"
+#define CT_BOOLEAN "ct_boolean"
+#define CT_ACCOUNTREF "ct_accountref"
+#define CT_COMMODITYREF "ct_commodityref"
+#define CT_TXREF "ct_txref"
typedef struct {
const gchar* col_name;
- E_COL_TYPE col_type;
+ const gchar* col_type;
gint size;
#define COL_PKEY 0x01
#define COL_NNUL 0x02
@@ -110,17 +105,17 @@
OP_DB_DELETE
} E_DB_OPERATION;
-typedef void (*GNC_GDA_LOAD_FN)( GncGdaBackend* be, GdaDataModel* pModel, gint row,
+typedef void (*GNC_GDA_LOAD_FN)( const GncGdaBackend* be, GdaDataModel* pModel, gint row,
QofSetterFunc setter, gpointer pObject,
const col_cvt_t* table );
typedef void (*GNC_GDA_CREATE_COL_FN)( GdaServerProvider* server,
GdaConnection* cnn, xmlNodePtr array_data,
const col_cvt_t* table_row, gboolean pkey );
-typedef void (*GNC_GDA_GET_GVALUE_QUERY_FN)( GncGdaBackend* be,
- QofIdTypeConst obj_name, gpointer pObject,
+typedef void (*GNC_GDA_GET_GVALUE_QUERY_FN)( const GncGdaBackend* be,
+ QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GdaQuery* query );
-typedef GdaQueryCondition* (*GNC_GDA_GET_GVALUE_COND_FN)( GncGdaBackend* be,
- QofIdTypeConst obj_name, gpointer pObject,
+typedef GdaQueryCondition* (*GNC_GDA_GET_GVALUE_COND_FN)( const GncGdaBackend* be,
+ QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table_row, GdaQuery* query );
typedef struct {
@@ -151,40 +146,40 @@
QofIdTypeConst obj_name,
gpointer pObject,
const col_cvt_t* table );
-GdaObject* gnc_gda_execute_query( GncGdaBackend* pBackend, GdaQuery* pQuery );
-GdaObject* gnc_gda_execute_sql( GncGdaBackend* pBackend, const gchar* sql );
-GdaQuery* gnc_gda_create_query_from_sql( GncGdaBackend* pBackend, const gchar* sql );
-int gnc_gda_execute_select_get_count( GncGdaBackend* pBackend, const gchar* sql );
-int gnc_gda_execute_query_get_count( GncGdaBackend* pBackend, GdaQuery* query );
-void gnc_gda_load_object( GncGdaBackend* be, GdaDataModel* pModel, int row,
+GdaObject* gnc_gda_execute_query( const GncGdaBackend* pBackend, GdaQuery* pQuery );
+GdaObject* gnc_gda_execute_sql( const GncGdaBackend* pBackend, const gchar* sql );
+GdaQuery* gnc_gda_create_query_from_sql( const GncGdaBackend* pBackend, const gchar* sql );
+int gnc_gda_execute_select_get_count( const GncGdaBackend* pBackend, const gchar* sql );
+int gnc_gda_execute_query_get_count( const GncGdaBackend* pBackend, GdaQuery* query );
+void gnc_gda_load_object( const GncGdaBackend* be, GdaDataModel* pModel, int row,
QofIdTypeConst obj_name, gpointer pObject,
const col_cvt_t* table );
-gboolean gnc_gda_object_is_it_in_db( GncGdaBackend* be,
+gboolean gnc_gda_object_is_it_in_db( const GncGdaBackend* be,
const gchar* table_name,
- QofIdTypeConst obj_name, gpointer pObject,
+ QofIdTypeConst obj_name, const gpointer pObject,
const col_cvt_t* table );
gboolean gnc_gda_create_table( GdaConnection* pConnection,
- const gchar* table_name, col_cvt_t* col_table,
+ const gchar* table_name, const col_cvt_t* col_table,
GError** error );
-void gnc_gda_create_table_if_needed( GncGdaBackend* be,
- const gchar* table_name, col_cvt_t* col_table );
-const GUID* gnc_gda_load_guid( GncGdaBackend* be, GdaDataModel* pModel, int row );
-const GUID* gnc_gda_load_tx_guid( GncGdaBackend* be, GdaDataModel* pModel, int row );
+void gnc_gda_create_table_if_needed( const GncGdaBackend* be,
+ const gchar* table_name, const col_cvt_t* col_table );
+const GUID* gnc_gda_load_guid( const GncGdaBackend* be, GdaDataModel* pModel, int row );
+const GUID* gnc_gda_load_tx_guid( const GncGdaBackend* be, GdaDataModel* pModel, int row );
GdaQuery* gnc_gda_create_select_query( const GncGdaBackend* be, const gchar* table_name );
GdaQueryCondition* gnc_gda_create_condition_from_field( GdaQuery* query,
const gchar* col_name,
const GValue* value );
-void gnc_gda_register_column_handler( int colType, col_type_handler_t* handler );
+void gnc_gda_register_column_handler( const gchar* colType, const col_type_handler_t* handler );
void gnc_gda_register_standard_col_type_handlers( void );
-void gnc_gda_get_gvalue_objectref_guid_for_query( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query );
-GdaQueryCondition* gnc_gda_get_gvalue_objectref_guid_cond( GncGdaBackend* be, QofIdTypeConst obj_name,
- gpointer pObject, const col_cvt_t* table_row, GdaQuery* query );
+void gnc_gda_get_gvalue_objectref_guid_for_query( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query );
+GdaQueryCondition* gnc_gda_get_gvalue_objectref_guid_cond( const GncGdaBackend* be, QofIdTypeConst obj_name,
+ const gpointer pObject, const col_cvt_t* table_row, GdaQuery* query );
void gnc_gda_create_objectref_guid_col( GdaServerProvider* server, GdaConnection* cnn,
xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey );
G_MODULE_EXPORT const gchar *
-g_module_check_init(GModule *module);
+g_module_check_init( GModule *module );
#endif /* GNC_BACKEND_GDA_UTIL_H_ */
Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -51,13 +51,13 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "commodity_guid", CT_GUID_C, 0, COL_NNUL, NULL, PRICE_COMMODITY },
- { "currency_guid", CT_GUID_C, 0, COL_NNUL, NULL, PRICE_CURRENCY },
- { "date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_date, set_date },
- { "source", CT_STRING, PRICE_MAX_SOURCE_LEN, 0, NULL, PRICE_SOURCE },
- { "type", CT_STRING, PRICE_MAX_TYPE_LEN, 0, NULL, PRICE_TYPE },
- { "value", CT_NUMERIC, 0, COL_NNUL, NULL, PRICE_VALUE },
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "commodity_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_COMMODITY },
+ { "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, PRICE_CURRENCY },
+ { "date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_date, set_date },
+ { "source", CT_STRING, PRICE_MAX_SOURCE_LEN, 0, NULL, PRICE_SOURCE },
+ { "type", CT_STRING, PRICE_MAX_TYPE_LEN, 0, NULL, PRICE_TYPE },
+ { "value", CT_NUMERIC, 0, COL_NNUL, NULL, PRICE_VALUE },
{ NULL }
};
Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -70,13 +70,13 @@
static col_cvt_t tx_col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "currency_guid", CT_GUID_C, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "currency_guid", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)xaccTransGetCurrency, (QofSetterFunc)xaccTransSetCurrency },
- { "num", CT_STRING, TX_MAX_NUM_LEN, COL_NNUL, NULL, NULL, get_tx_num, set_tx_num },
- { "post_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_tx_post_date, set_tx_post_date },
- { "enter_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_tx_enter_date, set_tx_enter_date },
- { "description", CT_STRING, TX_MAX_DESCRIPTION_LEN, 0, NULL, NULL,
+ { "num", CT_STRING, TX_MAX_NUM_LEN, COL_NNUL, NULL, TRANS_NUM },
+ { "post_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_tx_post_date, set_tx_post_date },
+ { "enter_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_tx_enter_date, set_tx_enter_date },
+ { "description", CT_STRING, TX_MAX_DESCRIPTION_LEN, 0, NULL, NULL,
(QofAccessFunc)xaccTransGetDescription, (QofSetterFunc)xaccTransSetDescription },
{ NULL }
};
@@ -91,15 +91,15 @@
static col_cvt_t split_col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "tx_guid", CT_GUID_T, 0, COL_NNUL, NULL, SPLIT_TRANS },
- { "account_guid", CT_GUID_A, 0, COL_NNUL, NULL, SPLIT_ACCOUNT },
- { "memo", CT_STRING, SPLIT_MAX_MEMO_LEN, COL_NNUL, NULL, SPLIT_MEMO },
- { "action", CT_STRING, SPLIT_MAX_ACTION_LEN, COL_NNUL, NULL, SPLIT_ACTION },
- { "reconcile_state", CT_STRING, 1, COL_NNUL, NULL, NULL, get_split_reconcile_state, set_split_reconcile_state },
- { "reconcile_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_split_reconcile_date, set_split_reconcile_date },
- { "value", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_VALUE },
- { "quantity", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_AMOUNT },
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "tx_guid", CT_TXREF, 0, COL_NNUL, NULL, SPLIT_TRANS },
+ { "account_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, SPLIT_ACCOUNT },
+ { "memo", CT_STRING, SPLIT_MAX_MEMO_LEN, COL_NNUL, NULL, SPLIT_MEMO },
+ { "action", CT_STRING, SPLIT_MAX_ACTION_LEN, COL_NNUL, NULL, SPLIT_ACTION },
+ { "reconcile_state", CT_STRING, 1, COL_NNUL, NULL, NULL, get_split_reconcile_state, set_split_reconcile_state },
+ { "reconcile_date", CT_TIMESPEC, 0, COL_NNUL, NULL, NULL, get_split_reconcile_date, set_split_reconcile_date },
+ { "value", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_VALUE },
+ { "quantity", CT_NUMERIC, 0, COL_NNUL, NULL, SPLIT_AMOUNT },
{ NULL }
};
Modified: gnucash/branches/gda-dev/src/business/business-core/gda/gnc-customer-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/business/business-core/gda/gnc-customer-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/business/business-core/gda/gnc-customer-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -49,16 +49,16 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, CUSTOMER_NAME },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, CUSTOMER_ID },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, CUSTOMER_NOTES },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
- { "discount", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_DISCOUNT },
- { "credit", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_CREDIT },
- { "currency", CT_GUID_C, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, CUSTOMER_NAME },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, CUSTOMER_ID },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, CUSTOMER_NOTES },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "discount", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_DISCOUNT },
+ { "credit", CT_NUMERIC, 0, COL_NNUL, NULL, CUSTOMER_CREDIT },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncCustomerGetCurrency, (QofSetterFunc)gncCustomerSetCurrency },
- { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, CUSTOMER_TT_OVER },
+ { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, CUSTOMER_TT_OVER },
{ NULL }
};
Modified: gnucash/branches/gda-dev/src/business/business-core/gda/gnc-employee-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/business/business-core/gda/gnc-employee-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/business/business-core/gda/gnc-employee-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -52,18 +52,17 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "username", CT_STRING, MAX_USERNAME_LEN, COL_NNUL, NULL, EMPLOYEE_USERNAME },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, EMPLOYEE_ID },
- { "language", CT_STRING, MAX_LANGUAGE_LEN, COL_NNUL, NULL, EMPLOYEE_LANGUAGE },
- { "acl", CT_STRING, MAX_ACL_LEN, COL_NNUL, NULL, EMPLOYEE_ACL },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
- (QofAccessFunc)gncEmployeeGetActive, (QofSetterFunc)gncEmployeeSetActive },
- { "currency", CT_GUID_C, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "username", CT_STRING, MAX_USERNAME_LEN, COL_NNUL, NULL, EMPLOYEE_USERNAME },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, EMPLOYEE_ID },
+ { "language", CT_STRING, MAX_LANGUAGE_LEN, COL_NNUL, NULL, EMPLOYEE_LANGUAGE },
+ { "acl", CT_STRING, MAX_ACL_LEN, COL_NNUL, NULL, EMPLOYEE_ACL },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncEmployeeGetCurrency, (QofSetterFunc)gncEmployeeSetCurrency },
- { "ccard_guid", CT_GUID_A, 0, COL_NNUL, NULL, EMPLOYEE_CC },
- { "workday", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_WORKDAY },
- { "rate", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_RATE },
+ { "ccard_guid", CT_ACCOUNTREF, 0, COL_NNUL, NULL, EMPLOYEE_CC },
+ { "workday", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_WORKDAY },
+ { "rate", CT_NUMERIC, 0, COL_NNUL, NULL, EMPLOYEE_RATE },
{ NULL }
};
Modified: gnucash/branches/gda-dev/src/business/business-core/gda/gnc-invoice-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/business/business-core/gda/gnc-invoice-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/business/business-core/gda/gnc-invoice-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -47,13 +47,13 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, INVOICE_ID },
- { "date_opened", CT_TIMESPEC, 0, COL_NNUL, NULL, INVOICE_OPENED },
- { "date_posted", CT_TIMESPEC, 0, 0, NULL, INVOICE_POSTED },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, INVOICE_NOTES },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
- { "currency", CT_GUID_C, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, INVOICE_ID },
+ { "date_opened", CT_TIMESPEC, 0, COL_NNUL, NULL, INVOICE_OPENED },
+ { "date_posted", CT_TIMESPEC, 0, 0, NULL, INVOICE_POSTED },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, INVOICE_NOTES },
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, QOF_PARAM_ACTIVE },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncInvoiceGetCurrency, (QofSetterFunc)gncInvoiceSetCurrency },
{ NULL }
};
Modified: gnucash/branches/gda-dev/src/business/business-core/gda/gnc-job-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/business/business-core/gda/gnc-job-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/business/business-core/gda/gnc-job-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -47,7 +47,6 @@
#if 0
/* ids */
#define job_owner_string "job:owner"
-#define job_slots_string "job:slots"
xmlAddChild(ret, gnc_owner_to_dom_tree (job_owner_string,
gncJobGetOwner (job)));
Modified: gnucash/branches/gda-dev/src/business/business-core/gda/gnc-vendor-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/business/business-core/gda/gnc-vendor-gda.c 2007-12-22 17:04:06 UTC (rev 16694)
+++ gnucash/branches/gda-dev/src/business/business-core/gda/gnc-vendor-gda.c 2007-12-22 18:18:37 UTC (rev 16695)
@@ -52,15 +52,15 @@
static col_cvt_t col_table[] =
{
- { "guid", CT_GUID, 0, COL_NNUL, "guid" },
- { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, VENDOR_NAME },
- { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, VENDOR_ID },
- { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, VENDOR_NOTES },
- { "currency", CT_GUID_C, 0, COL_NNUL, NULL, NULL,
+ { "guid", CT_GUID, 0, COL_NNUL, "guid" },
+ { "name", CT_STRING, MAX_NAME_LEN, COL_NNUL, NULL, VENDOR_NAME },
+ { "id", CT_STRING, MAX_ID_LEN, COL_NNUL, NULL, VENDOR_ID },
+ { "notes", CT_STRING, MAX_NOTES_LEN, COL_NNUL, NULL, VENDOR_NOTES },
+ { "currency", CT_COMMODITYREF, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncVendorGetCurrency, (QofSetterFunc)gncVendorSetCurrency },
- { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
+ { "active", CT_BOOLEAN, 0, COL_NNUL, NULL, NULL,
(QofAccessFunc)gncVendorGetActive, (QofSetterFunc)gncVendorSetActive },
- { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, VENDOR_TAX_OVERRIDE },
+ { "tax_override", CT_BOOLEAN, 0, COL_NNUL, NULL, VENDOR_TAX_OVERRIDE },
{ NULL }
};
@@ -69,7 +69,6 @@
#define vendor_terms_string "vendor:terms"
#define vendor_taxtable_string "vendor:taxtable"
#define vendor_taxtableoverride_string "vendor:use-tt"
-#define vendor_slots_string "vendor:slots"
xmlAddChild(ret, gnc_address_to_dom_tree(vendor_addr_string,
gncVendorGetAddr (vendor)));
More information about the gnucash-changes
mailing list