r16686 - gnucash/branches/gda-dev - 1) GDA backend accesses object GUID through

Phil Longstaff plongstaff at cvs.gnucash.org
Wed Dec 19 17:39:02 EST 2007


Author: plongstaff
Date: 2007-12-19 17:39:02 -0500 (Wed, 19 Dec 2007)
New Revision: 16686
Trac: http://svn.gnucash.org/trac/changeset/16686

Modified:
   gnucash/branches/gda-dev/configure.in
   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-book-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c
   gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c
   gnucash/branches/gda-dev/src/engine/Account.c
Log:
1) GDA backend accesses object GUID through
g_object_get()/g_object_set()
2) Account hidden/tax-related flags are now accessible as GObject
properties


Modified: gnucash/branches/gda-dev/configure.in
===================================================================
--- gnucash/branches/gda-dev/configure.in	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/configure.in	2007-12-19 22:39:02 UTC (rev 16686)
@@ -1564,7 +1564,7 @@
           src/business/Makefile
           src/business/business-core/Makefile
           src/business/business-core/test/Makefile
-          src/business/business-core/file/Makefile
+          src/business/business-core/xml/Makefile
           src/business/business-utils/Makefile
           src/business/dialog-tax-table/Makefile
           src/business/business-gnome/Makefile

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-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-account-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -60,21 +60,18 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",		CT_GUID,	0, COL_NNUL|COL_PKEY,	NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            (QofSetterFunc)xaccAccountSetGUID },
-    { "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,	0, COL_NNUL,	NULL, NULL,
-            get_commodity, set_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_GUID,   0,                           COL_NNUL, NULL, NULL, get_commodity, set_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[] =
 {
-    { "parent_guid",	CT_GUID,	0, 0,	NULL, NULL, NULL, set_parent_guid },
+    { "parent_guid", CT_GUID, 0, 0, NULL, NULL, NULL, set_parent_guid },
     { NULL }
 };
 

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-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-backend-util-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -65,7 +65,7 @@
                                 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 );
+                        const col_cvt_t* table_row, gboolean pkey );
 typedef void (*GNC_GDA_GET_GVALUE_QUERY_FN)( GncGdaBackend* be,
                 QofIdTypeConst obj_name, gpointer pObject,
                 const col_cvt_t* table_row, GdaQuery* query );
@@ -208,14 +208,14 @@
 
 static void
 create_string_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     const gchar* dbms_type;
 
     dbms_type = gda_server_provider_get_default_dbms_type( server,
                                                         cnn, G_TYPE_STRING );
     add_table_column( server, cnn, array_data, table_row->col_name,
-                    dbms_type, table_row->size, table_row->flags );
+                    dbms_type, table_row->size, table_row->flags | pkey ? COL_PKEY : 0 );
 }
 
 static col_type_handler_t string_handler
@@ -237,7 +237,11 @@
     } else {
         int_value = g_value_get_int( val );
     }
-    (*setter)( pObject, GINT_TO_POINTER(int_value) );
+    if( table->gobj_param_name != NULL ) {
+		g_object_set( pObject, table->gobj_param_name, int_value, NULL );
+    } else {
+    	(*setter)( pObject, GINT_TO_POINTER(int_value) );
+    }
 }
 
 static void
@@ -277,14 +281,14 @@
 
 static void
 create_int_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     const gchar* dbms_type;
 
     dbms_type = gda_server_provider_get_default_dbms_type( server,
                                                         cnn, G_TYPE_INT );
     add_table_column( server, cnn, array_data, table_row->col_name,
-                    dbms_type, table_row->size, table_row->flags );
+                    dbms_type, table_row->size, table_row->flags | pkey ? COL_PKEY : 0 );
 }
 
 static col_type_handler_t int_handler =
@@ -349,14 +353,14 @@
 
 static void
 create_int64_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     const gchar* dbms_type;
 
     dbms_type = gda_server_provider_get_default_dbms_type( server,
                                                         cnn, G_TYPE_INT64 );
     add_table_column( server, cnn, array_data, table_row->col_name,
-                    dbms_type, table_row->size, table_row->flags );
+                    dbms_type, table_row->size, table_row->flags | pkey ? COL_PKEY : 0 );
 }
 
 static col_type_handler_t int64_handler =
@@ -422,14 +426,14 @@
 
 static void
 create_double_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     const gchar* dbms_type;
 
     dbms_type = gda_server_provider_get_default_dbms_type( server,
                                                         cnn, G_TYPE_INT64 );
     add_table_column( server, cnn, array_data, table_row->col_name,
-                    dbms_type, table_row->size, table_row->flags );
+                    dbms_type, table_row->size, table_row->flags | pkey ? COL_PKEY : 0 );
 }
 
 static col_type_handler_t double_handler =
@@ -453,7 +457,11 @@
         string_to_guid( g_value_get_string( val ), &guid );
         pGuid = &guid;
     }
-    (*setter)( pObject, (gpointer)pGuid );
+    if( table->gobj_param_name != NULL ) {
+		g_object_set( pObject, table->gobj_param_name, pGuid, NULL );
+    } else {
+		(*setter)( pObject, (const gpointer)pGuid );
+    }
 }
 
 static void
@@ -466,8 +474,12 @@
 
     memset( value, 0, sizeof( GValue ) );
 
-    getter = get_getter( obj_name, table_row );
-    guid = (*getter)( pObject, NULL );
+	if( table_row->gobj_param_name != NULL ) {
+		g_object_get( pObject, table_row->gobj_param_name, &guid, NULL );
+	} else {
+    	getter = get_getter( obj_name, table_row );
+    	guid = (*getter)( pObject, NULL );
+	}
     if( guid != NULL ) {
         (void)guid_to_string_buff( guid, guid_buf );
         g_value_init( value, G_TYPE_STRING );
@@ -497,10 +509,10 @@
 
 static void
 create_guid_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     add_table_column( server, cnn, array_data, table_row->col_name,
-                    "char", GUID_ENCODING_LENGTH, table_row->flags );
+                    "char", GUID_ENCODING_LENGTH, table_row->flags | pkey ? COL_PKEY : 0 );
 }
 
 static col_type_handler_t guid_handler =
@@ -592,14 +604,14 @@
 
 static void
 create_timespec_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     const gchar* dbms_type;
 
     dbms_type = gda_server_provider_get_default_dbms_type( server,
                                                         cnn, G_TYPE_DATE );
     add_table_column( server, cnn, array_data, table_row->col_name,
-                    dbms_type, table_row->size, table_row->flags );
+                    dbms_type, table_row->size, table_row->flags | pkey ? COL_PKEY : 0 );
 }
 
 static col_type_handler_t timespec_handler =
@@ -832,7 +844,7 @@
 
 static void
 create_numeric_col( GdaServerProvider* server, GdaConnection* cnn,
-            xmlNodePtr array_data, const col_cvt_t* table_row )
+            xmlNodePtr array_data, const col_cvt_t* table_row, gboolean pkey )
 {
     const gchar* dbms_type;
     gchar* buf;
@@ -1325,7 +1337,7 @@
 
             pHandler = get_handler( col_table[col].col_type );
 
-            pHandler->create_col_fn( server, cnn, array_data, &col_table[col] );
+            pHandler->create_col_fn( server, cnn, array_data, &col_table[col], col == 0 );
         }
         
         if( !gda_server_operation_load_data_from_xml(op, root, error ) ) {

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-book-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -53,26 +53,16 @@
 static void set_root_account_guid( gpointer pObject, gpointer pValue );
 static gpointer get_root_template_guid( gpointer pObject, const QofParam* );
 static void set_root_template_guid( gpointer pObject, gpointer pValue );
-static void ignore( gpointer pObject, gpointer pValue );
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            /*(QofSetterFunc)qof_instance_set_guid*/ ignore },
-    { "root_account_guid", CT_GUID,  0, COL_NNUL,             NULL, NULL,
-            get_root_account_guid, set_root_account_guid },
-    { "root_template_guid", CT_GUID, 0, COL_NNUL,             NULL, NULL,
-            get_root_template_guid, set_root_template_guid },
+    { "guid",               CT_GUID, 0, COL_NNUL, "guid" },
+    { "root_account_guid",  CT_GUID, 0, COL_NNUL, NULL, NULL, get_root_account_guid,  set_root_account_guid },
+    { "root_template_guid", CT_GUID, 0, COL_NNUL, NULL, NULL, get_root_template_guid, set_root_template_guid },
     { NULL }
 };
 
 /* ================================================================= */
-static void 
-ignore( gpointer pObject, gpointer pValue )
-{
-}
-
 static gpointer
 get_root_account_guid( gpointer pObject, const QofParam* param )
 {

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-budget-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -52,12 +52,10 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            (QofSetterFunc)qof_instance_set_guid },
-    { "name",            CT_STRING,    BUDGET_MAX_NAME_LEN, COL_NNUL,    NULL, "name" },
-    { "description",    CT_STRING,    BUDGET_MAX_DESCRIPTION_LEN, 0,    NULL, "description" },
-    { "num_periods",    CT_INT,        0, COL_NNUL, NULL, "num_periods" },
+    { "guid",        CT_GUID,   0,                          COL_NNUL, "guid" },
+    { "name",        CT_STRING, BUDGET_MAX_NAME_LEN,        COL_NNUL, NULL, "name" },
+    { "description", CT_STRING, BUDGET_MAX_DESCRIPTION_LEN, 0,        NULL, "description" },
+    { "num_periods", CT_INT,    0,                          COL_NNUL, NULL, "num_periods" },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-commodity-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -57,30 +57,28 @@
 #define COMMODITY_MAX_QUOTE_TZ_LEN 50
 
 static col_cvt_t col_table[] = {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            (QofSetterFunc)qof_instance_set_guid },
-    { "namespace",        CT_STRING,    COMMODITY_MAX_NAMESPACE_LEN, COL_NNUL,    NULL, NULL,
+    { "guid",         CT_GUID,   0,                             COL_NNUL, "guid" },
+    { "namespace",    CT_STRING, COMMODITY_MAX_NAMESPACE_LEN,   COL_NNUL, NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_namespace,
             (QofSetterFunc)gnc_commodity_set_namespace },
-    { "mnemonic",        CT_STRING,    COMMODITY_MAX_MNEMONIC_LEN, COL_NNUL,    NULL, NULL,
+    { "mnemonic",     CT_STRING, COMMODITY_MAX_MNEMONIC_LEN,    COL_NNUL, NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_mnemonic,
             (QofSetterFunc)gnc_commodity_set_mnemonic },
-    { "fullname",        CT_STRING,    COMMODITY_MAX_FULLNAME_LEN, COL_NNUL,    NULL, NULL,
+    { "fullname",     CT_STRING, COMMODITY_MAX_FULLNAME_LEN,    COL_NNUL, NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_fullname,
             (QofSetterFunc)gnc_commodity_set_fullname },
-    { "cusip",            CT_STRING,    COMMODITY_MAX_CUSIP_LEN, 0,    NULL, NULL,
+    { "cusip",        CT_STRING, COMMODITY_MAX_CUSIP_LEN,       0,        NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_cusip,
             (QofSetterFunc)gnc_commodity_set_cusip },
-    { "fraction",        CT_INT,        0, COL_NNUL,    NULL, NULL,
+    { "fraction",     CT_INT,    0,                             COL_NNUL, NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_fraction,
             (QofSetterFunc)gnc_commodity_set_fraction },
-    { "quote_flag",        CT_INT,        0, COL_NNUL,    NULL, NULL,
+    { "quote_flag",   CT_INT,    0,                             COL_NNUL, NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_quote_flag,
             (QofSetterFunc)gnc_commodity_set_quote_flag },
-    { "quote_source",    CT_STRING,    COMMODITY_MAX_QUOTESOURCE_LEN, 0,    NULL, NULL,
+    { "quote_source", CT_STRING, COMMODITY_MAX_QUOTESOURCE_LEN, 0,        NULL, NULL,
             get_quote_source_name, set_quote_source_name },
-    { "quote_tz",        CT_STRING,    COMMODITY_MAX_QUOTE_TZ_LEN, 0,    NULL, NULL,
+    { "quote_tz",     CT_STRING, COMMODITY_MAX_QUOTE_TZ_LEN,    0,        NULL, NULL,
             (QofAccessFunc)gnc_commodity_get_quote_tz,
             (QofSetterFunc)gnc_commodity_set_quote_tz },
     { NULL }

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-lots-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -50,13 +50,9 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            (QofSetterFunc)qof_instance_set_guid },
-    { "account_guid",    CT_GUID,      0, COL_NNUL,    NULL, NULL,
-            get_lot_account, set_lot_account },
-    { "is_closed",        CT_STRING,  1, COL_NNUL, NULL, NULL,
-            get_lot_is_closed, set_lot_is_closed },
+    { "guid",         CT_GUID,   0, COL_NNUL, "guid" },
+    { "account_guid", CT_GUID,   0, COL_NNUL, NULL, NULL, get_lot_account,   set_lot_account },
+    { "is_closed",    CT_STRING, 1, COL_NNUL, NULL, NULL, get_lot_is_closed, set_lot_is_closed },
     { NULL }
 };
 

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-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-price-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -57,18 +57,13 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            (QofSetterFunc)qof_instance_set_guid },
-    { "commodity_guid",    CT_GUID,    0, COL_NNUL, NULL, NULL,
-            get_commodity_guid, set_commodity_guid },
-    { "currency_guid",    CT_GUID,    0, COL_NNUL, NULL, NULL,
-            get_currency_guid, set_currency_guid },
-    { "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, NULL, get_value, set_value },
+    { "guid",           CT_GUID,     0,                    COL_NNUL, "guid" },
+    { "commodity_guid", CT_GUID,     0,                    COL_NNUL, NULL, NULL,       get_commodity_guid, set_commodity_guid },
+    { "currency_guid",  CT_GUID,     0,                    COL_NNUL, NULL, NULL,       get_currency_guid,  set_currency_guid },
+    { "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, NULL,       get_value,          set_value },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-recurrence-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -64,15 +64,15 @@
 
 static col_cvt_t col_table[] =
 {
-    { "recurrence_id",        CT_INT,        0, COL_NNUL|COL_PKEY|COL_AUTOINC, NULL, NULL,
+    { "recurrence_id",           CT_INT,    0,                                     COL_NNUL|COL_AUTOINC, NULL, NULL,
             get_recurrence_id, set_recurrence_id },
-    { "obj_guid",        CT_GUID,    0, COL_NNUL,    NULL, NULL,
+    { "obj_guid",                CT_GUID,   0,                                     COL_NNUL,             NULL, NULL,
             get_obj_guid, set_obj_guid },
-    { "recurrence_mult", CT_INT,    0, COL_NNUL, NULL, NULL,
+    { "recurrence_mult",         CT_INT,    0,                                     COL_NNUL,             NULL, NULL,
             get_recurrence_mult, set_recurrence_mult },
-    { "recurrence_period_type", CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN,
-            COL_NNUL, NULL, NULL, get_recurrence_period_type, set_recurrence_period_type },
-    { "recurrence_period_start", CT_GDATE, 0, COL_NNUL, NULL, NULL,
+    { "recurrence_period_type",  CT_STRING, BUDGET_MAX_RECURRENCE_PERIOD_TYPE_LEN, COL_NNUL,             NULL, NULL,
+			get_recurrence_period_type, set_recurrence_period_type },
+    { "recurrence_period_start", CT_GDATE,  0,                                     COL_NNUL,             NULL, NULL,
             get_recurrence_period_start, set_recurrence_period_start },
     { NULL }
 };
@@ -81,8 +81,7 @@
 a column other than the primary key */
 static col_cvt_t guid_col_table[] =
 {
-    { "obj_guid",        CT_GUID,      0, COL_NNUL,    NULL, NULL,
-            get_obj_guid, set_obj_guid },
+    { "obj_guid", CT_GUID, 0, 0, NULL, NULL, get_obj_guid, set_obj_guid },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-schedxaction-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -59,26 +59,21 @@
 
 static col_cvt_t col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY,    NULL, NULL,
-            (QofAccessFunc)qof_instance_get_guid,
-            (QofSetterFunc)qof_instance_set_guid },
-    { "name",            CT_STRING, SX_MAX_NAME_LEN, 0, NULL, GNC_SX_NAME },
-    { "start_date",        CT_GDATE,    0, COL_NNUL, NULL, GNC_SX_START_DATE },
-    { "last_occur",        CT_GDATE,    0, 0, NULL, GNC_SX_LAST_DATE },
-    { "num_occur",        CT_INT,        0, COL_NNUL, NULL, GNC_SX_NUM_OCCUR },
-    { "rem_occur",        CT_INT,        0, COL_NNUL, NULL, GNC_SX_REM_OCCUR },
-    { "auto_create",    CT_BOOLEAN,    0, COL_NNUL, NULL, NULL,
-            get_autocreate, set_autocreate },
-    { "auto_notify",    CT_BOOLEAN,    0, COL_NNUL, NULL, NULL,
-            get_autonotify, set_autonotify },
-    { "adv_creation",    CT_INT,        0, COL_NNUL, NULL, NULL,
+    { "guid",              CT_GUID,    0,               COL_NNUL, "guid" },
+    { "name",              CT_STRING,  SX_MAX_NAME_LEN, 0,        NULL, GNC_SX_NAME },
+    { "start_date",        CT_GDATE,   0,               COL_NNUL, NULL, GNC_SX_START_DATE },
+    { "last_occur",        CT_GDATE,   0,               0,        NULL, GNC_SX_LAST_DATE },
+    { "num_occur",         CT_INT,     0,               COL_NNUL, NULL, GNC_SX_NUM_OCCUR },
+    { "rem_occur",         CT_INT,     0,               COL_NNUL, NULL, GNC_SX_REM_OCCUR },
+    { "auto_create",       CT_BOOLEAN, 0,               COL_NNUL, NULL, NULL,        get_autocreate,        set_autocreate },
+    { "auto_notify",       CT_BOOLEAN, 0,               COL_NNUL, NULL, NULL,        get_autonotify,        set_autonotify },
+    { "adv_creation",      CT_INT,     0,               COL_NNUL, NULL, NULL,
             (QofAccessFunc)xaccSchedXactionGetAdvanceCreation,
             (QofSetterFunc)xaccSchedXactionSetAdvanceCreation },
-    { "adv_notify",    CT_INT,        0, COL_NNUL, NULL, NULL,
+    { "adv_notify",        CT_INT,     0,               COL_NNUL, NULL, NULL,
             (QofAccessFunc)xaccSchedXactionGetAdvanceReminder,
             (QofSetterFunc)xaccSchedXactionSetAdvanceReminder },
-    { "template_act_guid", CT_GUID,    0, COL_NNUL,    NULL, NULL,
-            get_template_act_guid, set_template_act_guid },
+    { "template_act_guid", CT_GUID,    0,               COL_NNUL, NULL, NULL,        get_template_act_guid, set_template_act_guid },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c
===================================================================
--- gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-slots-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -77,26 +77,16 @@
 
 static col_cvt_t col_table[] =
 {
-    { "slot_id",        CT_INT,        0, COL_NNUL|COL_PKEY|COL_AUTOINC, NULL, NULL,
-            get_slot_id, set_slot_id },
-    { "obj_guid",        CT_GUID,    0, COL_NNUL,    NULL, NULL,
-            get_obj_guid, set_obj_guid },
-    { "name",            CT_STRING,    SLOT_MAX_PATHNAME_LEN, COL_NNUL,    NULL, NULL,
-            get_path, set_path },
-    { "slot_type",        CT_INT,        0, COL_NNUL,    NULL, NULL,
-            get_slot_type, set_slot_type, },
-    { "int64_val",        CT_INT64,    0, 0,            NULL, NULL,
-            get_int64_val, set_int64_val },
-    { "string_val",        CT_STRING,    SLOT_MAX_PATHNAME_LEN, 0,            NULL, NULL,
-            get_string_val, set_string_val },
-    { "double_val",        CT_DOUBLE,    0, 0,            NULL, NULL,
-            get_double_val, set_double_val },
-    { "timespec_val",    CT_TIMESPEC, 0, 0,            NULL, NULL,
-            get_timespec_val, set_timespec_val },
-    { "guid_val",        CT_GUID,    0, 0,            NULL, NULL,
-            get_guid_val, set_guid_val },
-    { "numeric_val",    CT_NUMERIC,    0, 0,            NULL, NULL,
-            get_numeric_val, set_numeric_val },
+    { "slot_id",      CT_INT,      0,                     COL_NNUL|COL_AUTOINC, NULL, NULL, get_slot_id,      set_slot_id },
+    { "obj_guid",     CT_GUID,     0,                     COL_NNUL,             NULL, NULL, get_obj_guid,     set_obj_guid },
+    { "name",         CT_STRING,   SLOT_MAX_PATHNAME_LEN, COL_NNUL,             NULL, NULL, get_path,         set_path },
+    { "slot_type",    CT_INT,      0,                     COL_NNUL,             NULL, NULL, get_slot_type,    set_slot_type, },
+    { "int64_val",    CT_INT64,    0,                     0,                    NULL, NULL, get_int64_val,    set_int64_val },
+    { "string_val",   CT_STRING,   SLOT_MAX_PATHNAME_LEN, 0,                    NULL, NULL, get_string_val,   set_string_val },
+    { "double_val",   CT_DOUBLE,   0,                     0,                    NULL, NULL, get_double_val,   set_double_val },
+    { "timespec_val", CT_TIMESPEC, 0,                     0,                    NULL, NULL, get_timespec_val, set_timespec_val },
+    { "guid_val",     CT_GUID,     0,                     0,                    NULL, NULL, get_guid_val,     set_guid_val },
+    { "numeric_val",  CT_NUMERIC,  0,                     0,                    NULL, NULL, get_numeric_val,  set_numeric_val },
     { NULL }
 };
 
@@ -104,8 +94,7 @@
 a column other than the primary key */
 static col_cvt_t guid_col_table[] =
 {
-    { "obj_guid",        CT_GUID,      0, COL_NNUL,    NULL, NULL,
-            get_obj_guid, set_obj_guid },
+    { "obj_guid", CT_GUID, 0, 0, NULL, NULL, get_obj_guid, set_obj_guid },
     { 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-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/backend/gda/gnc-transaction-gda.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -72,17 +72,12 @@
 
 static col_cvt_t tx_col_table[] =
 {
-    { "guid",          CT_GUID,    0, COL_NNUL|COL_PKEY, NULL, NULL,
-            get_guid, set_guid },
-    { "currency_guid", CT_GUID,    0, COL_NNUL,    NULL, NULL,
-            get_tx_currency_guid, set_tx_currency_guid },
-    { "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,
+    { "guid",          CT_GUID,     0,                      COL_NNUL, "guid" },
+    { "currency_guid", CT_GUID,     0,                      COL_NNUL, NULL, NULL, get_tx_currency_guid, set_tx_currency_guid },
+    { "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,
             (QofAccessFunc)xaccTransGetDescription,
             (QofSetterFunc)xaccTransSetDescription },
     { NULL }
@@ -106,22 +101,15 @@
 
 static col_cvt_t split_col_table[] =
 {
-    { "guid",            CT_GUID,    0, COL_NNUL|COL_PKEY, NULL, NULL,
-            get_guid, set_guid },
-    { "tx_guid",         CT_GUID,     0, COL_NNUL,    NULL, NULL,
-            get_split_tx_guid, set_split_tx_guid },
-    { "account_guid",    CT_GUID,    0, COL_NNUL,    NULL, NULL,
-            get_split_account_guid, set_split_account_guid },
-    { "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, NULL,
-            get_split_value, set_split_value },
-    { "quantity",        CT_NUMERIC, 0, COL_NNUL,    NULL, NULL,
-            get_split_quantity, set_split_quantity },
+    { "guid",            CT_GUID,     0,                    COL_NNUL, "guid" },
+    { "tx_guid",         CT_GUID,     0,                    COL_NNUL, NULL, NULL,    get_split_tx_guid,         set_split_tx_guid },
+    { "account_guid",    CT_GUID,     0,                    COL_NNUL, NULL, NULL,    get_split_account_guid,    set_split_account_guid },
+    { "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, NULL,    get_split_value,           set_split_value },
+    { "quantity",        CT_NUMERIC,  0,                    COL_NNUL, NULL, NULL,    get_split_quantity,        set_split_quantity },
     { NULL }
 };
 

Modified: gnucash/branches/gda-dev/src/engine/Account.c
===================================================================
--- gnucash/branches/gda-dev/src/engine/Account.c	2007-12-19 22:37:37 UTC (rev 16685)
+++ gnucash/branches/gda-dev/src/engine/Account.c	2007-12-19 22:39:02 UTC (rev 16686)
@@ -78,6 +78,9 @@
   PROP_TAX_RELATED,
   PROP_TAX_CODE,
   PROP_TAX_SOURCE,
+
+  PROP_HIDDEN,
+  PROP_PLACEHOLDER,
 };
 
 typedef struct AccountPrivate
@@ -347,6 +350,12 @@
 	    g_value_set_string(value,
 			       xaccAccountGetTaxUSPayerNameSource(account));
 	    break;
+	case PROP_HIDDEN:
+		g_value_set_boolean(value, xaccAccountGetHidden(account));
+		break;
+	case PROP_PLACEHOLDER:
+		g_value_set_boolean(value, xaccAccountGetPlaceholder(account));
+		break;
 	default:
 	    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 	    break;
@@ -422,6 +431,12 @@
 	case PROP_TAX_SOURCE:
 	    xaccAccountSetTaxUSPayerNameSource(account,
 					       g_value_get_string(value));
+	case PROP_HIDDEN:
+		xaccAccountSetHidden(account, g_value_get_boolean(value));
+		break;
+	case PROP_PLACEHOLDER:
+		xaccAccountSetPlaceholder(account, g_value_get_boolean(value));
+		break;
 	default:
 	    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
 	    break;
@@ -547,7 +562,7 @@
          PROP_NON_STD_SCU,
          g_param_spec_boolean ("non-std-scu",
                                "Non-std SCU",
-                               "TRUE id the account SCU doesn't match "
+                               "TRUE if the account SCU doesn't match "
                                "the commodity SCU.  This indicates a case "
                                "where the two were accidentally set to "
                                "mismatched values in older versions of "
@@ -718,6 +733,16 @@
                               "This is an unknown tax related field.",
                               NULL,
                               G_PARAM_READWRITE));
+
+    g_object_class_install_property
+        (gobject_class,
+         PROP_HIDDEN,
+         g_param_spec_boolean ("hidden",
+                               "Hidden",
+                               "Whether the account should be hidden in the  "
+			       "account tree.",
+                               FALSE,
+                               G_PARAM_READWRITE));
 }
 
 static void



More information about the gnucash-changes mailing list