From 44e679a5a3d7755f961f96950536307b1588796f Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Sun, 13 Nov 2011 21:33:29 +0000 Subject: [PATCH] Minor code cleanup: Rename field "primary_book" into "book" because there are no multiple books in gnucash at all. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21566 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/backend/dbi/gnc-backend-dbi.c | 2 +- src/backend/sql/gnc-account-sql.c | 12 +++++------ src/backend/sql/gnc-address-sql.c | 2 +- src/backend/sql/gnc-backend-sql.c | 28 +++++++++++++------------- src/backend/sql/gnc-backend-sql.h | 2 +- src/backend/sql/gnc-bill-term-sql.c | 10 ++++----- src/backend/sql/gnc-book-sql.c | 4 ++-- src/backend/sql/gnc-budget-sql.c | 10 ++++----- src/backend/sql/gnc-commodity-sql.c | 6 +++--- src/backend/sql/gnc-customer-sql.c | 8 ++++---- src/backend/sql/gnc-employee-sql.c | 8 ++++---- src/backend/sql/gnc-entry-sql.c | 8 ++++---- src/backend/sql/gnc-invoice-sql.c | 10 ++++----- src/backend/sql/gnc-job-sql.c | 8 ++++---- src/backend/sql/gnc-lots-sql.c | 6 +++--- src/backend/sql/gnc-order-sql.c | 10 ++++----- src/backend/sql/gnc-owner-sql.c | 2 +- src/backend/sql/gnc-price-sql.c | 6 +++--- src/backend/sql/gnc-schedxaction-sql.c | 4 ++-- src/backend/sql/gnc-slots-sql.c | 2 +- src/backend/sql/gnc-tax-table-sql.c | 8 ++++---- src/backend/sql/gnc-transaction-sql.c | 20 +++++++++--------- src/backend/sql/gnc-vendor-sql.c | 8 ++++---- src/backend/xml/gnc-backend-xml.c | 22 +++++++++----------- src/backend/xml/gnc-backend-xml.h | 2 +- 25 files changed, 103 insertions(+), 105 deletions(-) diff --git a/src/backend/dbi/gnc-backend-dbi.c b/src/backend/dbi/gnc-backend-dbi.c index 8e8949d7b8..9d9137d0a8 100644 --- a/src/backend/dbi/gnc-backend-dbi.c +++ b/src/backend/dbi/gnc-backend-dbi.c @@ -1693,7 +1693,7 @@ init_sql_backend( GncDbiBackend* dbi_be ) gnc_sql_init( &dbi_be->sql_be ); dbi_be->sql_be.conn = NULL; - dbi_be->sql_be.primary_book = NULL; + dbi_be->sql_be.book = NULL; } static QofBackend* diff --git a/src/backend/sql/gnc-account-sql.c b/src/backend/sql/gnc-account-sql.c index e46bc8708c..2f1f14c0f7 100644 --- a/src/backend/sql/gnc-account-sql.c +++ b/src/backend/sql/gnc-account-sql.c @@ -169,11 +169,11 @@ load_single_account( GncSqlBackend* be, GncSqlRow* row, guid = gnc_sql_load_guid( be, row ); if ( guid != NULL ) { - pAccount = xaccAccountLookup( guid, be->primary_book ); + pAccount = xaccAccountLookup( guid, be->book ); } if ( pAccount == NULL ) { - pAccount = xaccMallocAccount( be->primary_book ); + pAccount = xaccMallocAccount( be->book ); } xaccAccountBeginEdit( pAccount ); gnc_sql_load_object( be, row, GNC_ID_ACCOUNT, pAccount, col_table ); @@ -182,7 +182,7 @@ load_single_account( GncSqlBackend* be, GncSqlRow* row, /* If we don't have a parent and this isn't the root account, it might be because the parent account hasn't been loaded yet. Remember the account and its parent guid for later. */ if ( gnc_account_get_parent( pAccount ) == NULL - && pAccount != gnc_book_get_root_account( be->primary_book ) ) + && pAccount != gnc_book_get_root_account( be->book ) ) { account_parent_guid_struct* s = g_malloc( (gsize)sizeof(account_parent_guid_struct) ); g_assert( s != NULL ); @@ -210,7 +210,7 @@ load_all_accounts( GncSqlBackend* be ) ENTER( "" ); - pBook = be->primary_book; + pBook = be->book; pTable = gnc_commodity_table_get_table( pBook ); stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); @@ -256,7 +256,7 @@ load_all_accounts( GncSqlBackend* be ) for ( elem = l_accounts_needing_parents; elem != NULL; ) { account_parent_guid_struct* s = (account_parent_guid_struct*)elem->data; - pParent = xaccAccountLookup( &s->guid, be->primary_book ); + pParent = xaccAccountLookup( &s->guid, be->book ); if ( pParent != NULL ) { GList* next_elem; @@ -416,7 +416,7 @@ load_account_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { (void)string_to_guid( g_value_get_string( val ), &guid ); - account = xaccAccountLookup( &guid, be->primary_book ); + account = xaccAccountLookup( &guid, be->book ); if ( account != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-address-sql.c b/src/backend/sql/gnc-address-sql.c index b6fd6d8171..897ca20056 100644 --- a/src/backend/sql/gnc-address-sql.c +++ b/src/backend/sql/gnc-address-sql.c @@ -82,7 +82,7 @@ load_address( const GncSqlBackend* be, GncSqlRow* row, g_return_if_fail( pObject != NULL ); g_return_if_fail( table_row != NULL ); - addr = gncAddressCreate( be->primary_book, NULL ); + addr = gncAddressCreate( be->book, NULL ); for ( subtable = col_table; subtable->col_name != NULL; subtable++ ) { buf = g_strdup_printf( "%s_%s", table_row->col_name, subtable->col_name ); diff --git a/src/backend/sql/gnc-backend-sql.c b/src/backend/sql/gnc-backend-sql.c index d904243481..f5e8d19bc0 100644 --- a/src/backend/sql/gnc-backend-sql.c +++ b/src/backend/sql/gnc-backend-sql.c @@ -229,8 +229,8 @@ gnc_sql_load( GncSqlBackend* be, /*@ dependent @*/ QofBook *book, QofBackendLoad if ( loadType == LOAD_TYPE_INITIAL_LOAD ) { - g_assert( be->primary_book == NULL ); - be->primary_book = book; + g_assert( be->book == NULL ); + be->book = book; /* Load any initial stuff. Some of this needs to happen in a certain order */ for ( i = 0; fixed_load_order[i] != NULL; i++ ) @@ -367,11 +367,11 @@ write_accounts( GncSqlBackend* be ) g_return_val_if_fail( be != NULL, FALSE ); update_progress( be ); - is_ok = write_account_tree( be, gnc_book_get_root_account( be->primary_book ) ); + is_ok = write_account_tree( be, gnc_book_get_root_account( be->book ) ); if ( is_ok ) { update_progress( be ); - is_ok = write_account_tree( be, gnc_book_get_template_root( be->primary_book ) ); + is_ok = write_account_tree( be, gnc_book_get_template_root( be->book ) ); } return is_ok; @@ -408,7 +408,7 @@ write_transactions( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; (void)xaccAccountTreeForEachTransaction( - gnc_book_get_root_account( be->primary_book ), write_tx, &data ); + gnc_book_get_root_account( be->book ), write_tx, &data ); update_progress( be ); return data.is_ok; } @@ -423,7 +423,7 @@ write_template_transactions( GncSqlBackend* be ) data.is_ok = TRUE; data.be = be; - ra = gnc_book_get_template_root( be->primary_book ); + ra = gnc_book_get_template_root( be->book ); if ( gnc_account_n_descendants( ra ) > 0 ) { (void)xaccAccountTreeForEachTransaction( ra, write_tx, &data ); @@ -442,7 +442,7 @@ write_schedXactions( GncSqlBackend* be ) g_return_val_if_fail( be != NULL, FALSE ); - schedXactions = gnc_book_get_schedxactions( be->primary_book )->sx_list; + schedXactions = gnc_book_get_schedxactions( be->book )->sx_list; for ( ; schedXactions != NULL && is_ok; schedXactions = schedXactions->next ) { @@ -492,7 +492,7 @@ gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book ) g_return_if_fail( be != NULL ); g_return_if_fail( book != NULL ); - ENTER( "book=%p, primary=%p", book, be->primary_book ); + ENTER( "book=%p, be->book=%p", book, be->book ); update_progress( be ); (void)reset_version_info( be ); gnc_sql_set_table_version( be, "Gnucash", gnc_get_long_version() ); @@ -503,7 +503,7 @@ gnc_sql_sync_all( GncSqlBackend* be, /*@ dependent @*/ QofBook *book ) qof_object_foreach_backend( GNC_SQL_BACKEND, create_tables_cb, be ); /* Save all contents */ - be->primary_book = book; + be->book = book; be->obj_total = 0; be->obj_total += 1 + gnc_account_n_descendants( gnc_book_get_root_account( book ) ); be->obj_total += gnc_book_count_transactions( book ); @@ -614,7 +614,7 @@ gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst ) g_return_if_fail( be != NULL ); g_return_if_fail( inst != NULL ); - if ( qof_book_is_readonly( be->primary_book ) ) + if ( qof_book_is_readonly( be->book ) ) { qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY ); (void)gnc_sql_connection_rollback_transaction( be->conn ); @@ -632,7 +632,7 @@ gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst ) if ( strcmp( inst->e_type, "PriceDB" ) == 0 ) { qof_instance_mark_clean( inst ); - qof_book_mark_saved( be->primary_book ); + qof_book_mark_saved( be->book ); return; } @@ -673,7 +673,7 @@ gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst ) // Don't let unknown items still mark the book as being dirty qof_instance_mark_clean(inst); - qof_book_mark_saved( be->primary_book ); + qof_book_mark_saved( be->book ); LEAVE( "Rolled back - unknown object type" ); return; } @@ -690,7 +690,7 @@ gnc_sql_commit_edit( GncSqlBackend *be, QofInstance *inst ) (void)gnc_sql_connection_commit_transaction( be->conn ); qof_instance_mark_clean(inst); - qof_book_mark_saved( be->primary_book ); + qof_book_mark_saved( be->book ); LEAVE( "" ); } @@ -1070,7 +1070,7 @@ gnc_sql_run_query( QofBackend* pBEnd, gpointer pQuery ) // } // Mark the book as clean - qof_instance_mark_clean( QOF_INSTANCE(be->primary_book) ); + qof_instance_mark_clean( QOF_INSTANCE(be->book) ); // DEBUG( "%s\n", (gchar*)pQueryInfo->pCompiledQuery ); diff --git a/src/backend/sql/gnc-backend-sql.h b/src/backend/sql/gnc-backend-sql.h index 2b6f1b2883..88410995f4 100644 --- a/src/backend/sql/gnc-backend-sql.h +++ b/src/backend/sql/gnc-backend-sql.h @@ -55,7 +55,7 @@ struct GncSqlBackend QofBackend be; /**< QOF backend */ GncSqlConnection* conn; /**< SQL connection */ /*@ dependent @*/ - QofBook *primary_book; /**< The primary, main open book */ + QofBook *book; /**< The primary, main open book */ gboolean loading; /**< We are performing an initial load */ gboolean in_query; /**< We are processing a query */ gboolean is_pristine_db; /**< Are we saving to a new pristine db? */ diff --git a/src/backend/sql/gnc-bill-term-sql.c b/src/backend/sql/gnc-bill-term-sql.c index 3cc853316b..f304223acc 100644 --- a/src/backend/sql/gnc-bill-term-sql.c +++ b/src/backend/sql/gnc-bill-term-sql.c @@ -187,10 +187,10 @@ load_single_billterm( GncSqlBackend* be, GncSqlRow* row, g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pBillTerm = gncBillTermLookup( be->primary_book, guid ); + pBillTerm = gncBillTermLookup( be->book, guid ); if ( pBillTerm == NULL ) { - pBillTerm = gncBillTermCreate( be->primary_book ); + pBillTerm = gncBillTermCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_BILLTERM, pBillTerm, col_table ); @@ -229,7 +229,7 @@ load_all_billterms( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -312,7 +312,7 @@ write_billterms( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_BILLTERM, be->primary_book, do_save_billterm, &data ); + qof_object_foreach( GNC_ID_BILLTERM, be->book, do_save_billterm, &data ); return data.is_ok; } @@ -369,7 +369,7 @@ load_billterm_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { string_to_guid( g_value_get_string( val ), &guid ); - term = gncBillTermLookup( be->primary_book, &guid ); + term = gncBillTermLookup( be->book, &guid ); if ( term != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-book-sql.c b/src/backend/sql/gnc-book-sql.c index 44c85a3c00..a58804c49d 100644 --- a/src/backend/sql/gnc-book-sql.c +++ b/src/backend/sql/gnc-book-sql.c @@ -148,7 +148,7 @@ load_single_book( GncSqlBackend* be, GncSqlRow* row ) guid = gnc_sql_load_guid( be, row ); - pBook = be->primary_book; + pBook = be->book; if ( pBook == NULL ) { pBook = qof_book_new(); @@ -182,7 +182,7 @@ load_all_books( GncSqlBackend* be ) // If there are no rows, try committing the book if ( row == NULL ) { - (void)gnc_sql_save_book( be, QOF_INSTANCE(be->primary_book) ); + (void)gnc_sql_save_book( be, QOF_INSTANCE(be->book) ); } else { diff --git a/src/backend/sql/gnc-budget-sql.c b/src/backend/sql/gnc-budget-sql.c index a90142569f..208f0f4508 100644 --- a/src/backend/sql/gnc-budget-sql.c +++ b/src/backend/sql/gnc-budget-sql.c @@ -275,7 +275,7 @@ save_budget_amounts( GncSqlBackend* be, GncBudget* budget ) info.budget = budget; num_periods = gnc_budget_get_num_periods( budget ); - descendants = gnc_account_get_descendants( gnc_book_get_root_account( be->primary_book ) ); + descendants = gnc_account_get_descendants( gnc_book_get_root_account( be->book ) ); for ( node = descendants; node != NULL && is_ok; node = g_list_next(node) ) { guint i; @@ -309,11 +309,11 @@ load_single_budget( GncSqlBackend* be, GncSqlRow* row ) guid = gnc_sql_load_guid( be, row ); if ( guid != NULL ) { - pBudget = gnc_budget_lookup( guid, be->primary_book ); + pBudget = gnc_budget_lookup( guid, be->book ); } if ( pBudget == NULL ) { - pBudget = gnc_budget_new( be->primary_book ); + pBudget = gnc_budget_new( be->book ); } gnc_budget_begin_edit( pBudget ); @@ -472,7 +472,7 @@ write_budgets( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_collection_foreach( qof_book_get_collection( be->primary_book, GNC_ID_BUDGET ), + qof_collection_foreach( qof_book_get_collection( be->book, GNC_ID_BUDGET ), (QofInstanceForeachCB)do_save_budget, &data ); return data.is_ok; @@ -497,7 +497,7 @@ load_budget_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { (void)string_to_guid( g_value_get_string( val ), &guid ); - budget = gnc_budget_lookup( &guid, be->primary_book ); + budget = gnc_budget_lookup( &guid, be->book ); if ( budget != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-commodity-sql.c b/src/backend/sql/gnc-commodity-sql.c index 7296530a51..2389946898 100644 --- a/src/backend/sql/gnc-commodity-sql.c +++ b/src/backend/sql/gnc-commodity-sql.c @@ -115,7 +115,7 @@ set_quote_source_name( gpointer pObject, gpointer pValue ) static /*@ dependent @*/ gnc_commodity* load_single_commodity( GncSqlBackend* be, GncSqlRow* row ) { - QofBook* pBook = be->primary_book; + QofBook* pBook = be->book; gnc_commodity* pCommodity; pCommodity = gnc_commodity_new( pBook, NULL, NULL, NULL, NULL, 100 ); @@ -133,7 +133,7 @@ load_all_commodities( GncSqlBackend* be ) GncSqlResult* result; gnc_commodity_table* pTable; - pTable = gnc_commodity_table_get_table( be->primary_book ); + pTable = gnc_commodity_table_get_table( be->book ); stmt = gnc_sql_create_select_statement( be, COMMODITIES_TABLE ); if ( stmt == NULL ) return; result = gnc_sql_execute_select_statement( be, stmt ); @@ -278,7 +278,7 @@ load_commodity_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { (void)string_to_guid( g_value_get_string( val ), &guid ); - commodity = gnc_commodity_find_commodity_by_guid( &guid, be->primary_book ); + commodity = gnc_commodity_find_commodity_by_guid( &guid, be->book ); if ( commodity != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-customer-sql.c b/src/backend/sql/gnc-customer-sql.c index 7680c96800..4fc0605bc3 100644 --- a/src/backend/sql/gnc-customer-sql.c +++ b/src/backend/sql/gnc-customer-sql.c @@ -94,10 +94,10 @@ load_single_customer( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pCustomer = gncCustomerLookup( be->primary_book, guid ); + pCustomer = gncCustomerLookup( be->book, guid ); if ( pCustomer == NULL ) { - pCustomer = gncCustomerCreate( be->primary_book ); + pCustomer = gncCustomerCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_CUSTOMER, pCustomer, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pCustomer) ); @@ -114,7 +114,7 @@ load_all_customers( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -226,7 +226,7 @@ write_customers( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_CUSTOMER, be->primary_book, write_single_customer, (gpointer)&data ); + qof_object_foreach( GNC_ID_CUSTOMER, be->book, write_single_customer, (gpointer)&data ); return data.is_ok; } diff --git a/src/backend/sql/gnc-employee-sql.c b/src/backend/sql/gnc-employee-sql.c index d409154c15..aa13877b87 100644 --- a/src/backend/sql/gnc-employee-sql.c +++ b/src/backend/sql/gnc-employee-sql.c @@ -85,10 +85,10 @@ load_single_employee( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pEmployee = gncEmployeeLookup( be->primary_book, guid ); + pEmployee = gncEmployeeLookup( be->book, guid ); if ( pEmployee == NULL ) { - pEmployee = gncEmployeeCreate( be->primary_book ); + pEmployee = gncEmployeeCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_EMPLOYEE, pEmployee, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pEmployee) ); @@ -106,7 +106,7 @@ load_all_employees( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; pTable = gnc_commodity_table_get_table( pBook ); stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); @@ -259,7 +259,7 @@ write_employees( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_EMPLOYEE, be->primary_book, write_single_employee, &data ); + qof_object_foreach( GNC_ID_EMPLOYEE, be->book, write_single_employee, &data ); return data.is_ok; } diff --git a/src/backend/sql/gnc-entry-sql.c b/src/backend/sql/gnc-entry-sql.c index 4dd8d6e898..4a8ef02f8c 100644 --- a/src/backend/sql/gnc-entry-sql.c +++ b/src/backend/sql/gnc-entry-sql.c @@ -159,10 +159,10 @@ load_single_entry( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pEntry = gncEntryLookup( be->primary_book, guid ); + pEntry = gncEntryLookup( be->book, guid ); if ( pEntry == NULL ) { - pEntry = gncEntryCreate( be->primary_book ); + pEntry = gncEntryCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_ENTRY, pEntry, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pEntry) ); @@ -179,7 +179,7 @@ load_all_entries( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -274,7 +274,7 @@ write_entries( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_ENTRY, be->primary_book, write_single_entry, &data ); + qof_object_foreach( GNC_ID_ENTRY, be->book, write_single_entry, &data ); return data.is_ok; } diff --git a/src/backend/sql/gnc-invoice-sql.c b/src/backend/sql/gnc-invoice-sql.c index 216873afb2..10d46074c4 100644 --- a/src/backend/sql/gnc-invoice-sql.c +++ b/src/backend/sql/gnc-invoice-sql.c @@ -102,10 +102,10 @@ load_single_invoice( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pInvoice = gncInvoiceLookup( be->primary_book, guid ); + pInvoice = gncInvoiceLookup( be->book, guid ); if ( pInvoice == NULL ) { - pInvoice = gncInvoiceCreate( be->primary_book ); + pInvoice = gncInvoiceCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_INVOICE, pInvoice, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pInvoice) ); @@ -122,7 +122,7 @@ load_all_invoices( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -277,7 +277,7 @@ write_invoices( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_INVOICE, be->primary_book, write_single_invoice, &data ); + qof_object_foreach( GNC_ID_INVOICE, be->book, write_single_invoice, &data ); return data.is_ok; } @@ -301,7 +301,7 @@ load_invoice_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { string_to_guid( g_value_get_string( val ), &guid ); - invoice = gncInvoiceLookup( be->primary_book, &guid ); + invoice = gncInvoiceLookup( be->book, &guid ); if ( invoice != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-job-sql.c b/src/backend/sql/gnc-job-sql.c index fb7bf36f00..1a941b90ee 100644 --- a/src/backend/sql/gnc-job-sql.c +++ b/src/backend/sql/gnc-job-sql.c @@ -79,10 +79,10 @@ load_single_job( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pJob = gncJobLookup( be->primary_book, guid ); + pJob = gncJobLookup( be->book, guid ); if ( pJob == NULL ) { - pJob = gncJobCreate( be->primary_book ); + pJob = gncJobCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_JOB, pJob, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pJob) ); @@ -99,7 +99,7 @@ load_all_jobs( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -197,7 +197,7 @@ write_jobs( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_JOB, be->primary_book, write_single_job, &data ); + qof_object_foreach( GNC_ID_JOB, be->book, write_single_job, &data ); return data.is_ok; } diff --git a/src/backend/sql/gnc-lots-sql.c b/src/backend/sql/gnc-lots-sql.c index 0adcc1a27e..9d7ac58861 100644 --- a/src/backend/sql/gnc-lots-sql.c +++ b/src/backend/sql/gnc-lots-sql.c @@ -104,7 +104,7 @@ load_single_lot( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( be != NULL, NULL ); g_return_val_if_fail( row != NULL, NULL ); - lot = gnc_lot_new( be->primary_book ); + lot = gnc_lot_new( be->book ); gnc_lot_begin_edit( lot ); gnc_sql_load_object( be, row, GNC_ID_LOT, lot, col_table ); @@ -207,7 +207,7 @@ write_lots( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_collection_foreach( qof_book_get_collection( be->primary_book, GNC_ID_LOT ), + qof_collection_foreach( qof_book_get_collection( be->book, GNC_ID_LOT ), (QofInstanceForeachCB)do_save_lot, &data ); return data.is_ok; } @@ -231,7 +231,7 @@ load_lot_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { (void)string_to_guid( g_value_get_string( val ), &guid ); - lot = gnc_lot_lookup( &guid, be->primary_book ); + lot = gnc_lot_lookup( &guid, be->book ); if ( lot != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-order-sql.c b/src/backend/sql/gnc-order-sql.c index 2698f2b4d8..4cdf6919c4 100644 --- a/src/backend/sql/gnc-order-sql.c +++ b/src/backend/sql/gnc-order-sql.c @@ -76,10 +76,10 @@ load_single_order( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pOrder = gncOrderLookup( be->primary_book, guid ); + pOrder = gncOrderLookup( be->book, guid ); if ( pOrder == NULL ) { - pOrder = gncOrderCreate( be->primary_book ); + pOrder = gncOrderCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_ORDER, pOrder, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pOrder) ); @@ -96,7 +96,7 @@ load_all_orders( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -194,7 +194,7 @@ write_orders( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_ORDER, be->primary_book, write_single_order, &data ); + qof_object_foreach( GNC_ID_ORDER, be->book, write_single_order, &data ); return data.is_ok; } @@ -218,7 +218,7 @@ load_order_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { string_to_guid( g_value_get_string( val ), &guid ); - order = gncOrderLookup( be->primary_book, &guid ); + order = gncOrderLookup( be->book, &guid ); if ( order != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-owner-sql.c b/src/backend/sql/gnc-owner-sql.c index 7bc02f73fc..0f3d3372fd 100644 --- a/src/backend/sql/gnc-owner-sql.c +++ b/src/backend/sql/gnc-owner-sql.c @@ -65,7 +65,7 @@ load_owner( const GncSqlBackend* be, GncSqlRow* row, g_return_if_fail( pObject != NULL ); g_return_if_fail( table_row != NULL ); - book = be->primary_book; + book = be->book; buf = g_strdup_printf( "%s_type", table_row->col_name ); val = gnc_sql_row_get_value_at_col_name( row, buf ); type = (GncOwnerType)gnc_sql_get_integer_value( val ); diff --git a/src/backend/sql/gnc-price-sql.c b/src/backend/sql/gnc-price-sql.c index 8ddb12478a..d7e6b70282 100644 --- a/src/backend/sql/gnc-price-sql.c +++ b/src/backend/sql/gnc-price-sql.c @@ -75,7 +75,7 @@ load_single_price( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( be != NULL, NULL ); g_return_val_if_fail( row != NULL, NULL ); - pPrice = gnc_price_create( be->primary_book ); + pPrice = gnc_price_create( be->book ); gnc_price_begin_edit( pPrice ); gnc_sql_load_object( be, row, GNC_ID_PRICE, pPrice, col_table ); @@ -94,7 +94,7 @@ load_all_prices( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; pPriceDB = gnc_pricedb_get_db( pBook ); stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); if ( stmt != NULL ) @@ -219,7 +219,7 @@ write_prices( GncSqlBackend* be ) g_return_val_if_fail( be != NULL, FALSE ); - priceDB = gnc_pricedb_get_db( be->primary_book ); + priceDB = gnc_pricedb_get_db( be->book ); data.be = be; data.is_ok = TRUE; diff --git a/src/backend/sql/gnc-schedxaction-sql.c b/src/backend/sql/gnc-schedxaction-sql.c index f20cbfeed6..a5b1ecdaa7 100644 --- a/src/backend/sql/gnc-schedxaction-sql.c +++ b/src/backend/sql/gnc-schedxaction-sql.c @@ -90,7 +90,7 @@ load_single_sx( GncSqlBackend* be, GncSqlRow* row ) guid = gnc_sql_load_guid( be, row ); g_assert( guid != NULL ); - pSx = xaccSchedXactionMalloc( be->primary_book ); + pSx = xaccSchedXactionMalloc( be->book ); gnc_sx_begin_edit( pSx ); gnc_sql_load_object( be, row, GNC_SX_ID, pSx, col_table ); @@ -121,7 +121,7 @@ load_all_sxes( GncSqlBackend* be ) GncSqlRow* row; SchedXactions *sxes; GList* list = NULL; - sxes = gnc_book_get_schedxactions( be->primary_book ); + sxes = gnc_book_get_schedxactions( be->book ); row = gnc_sql_result_get_first_row( result ); while ( row != NULL ) diff --git a/src/backend/sql/gnc-slots-sql.c b/src/backend/sql/gnc-slots-sql.c index 1cc8b3b5d9..9aaf48a92d 100644 --- a/src/backend/sql/gnc-slots-sql.c +++ b/src/backend/sql/gnc-slots-sql.c @@ -979,7 +979,7 @@ load_slot_for_book_object( GncSqlBackend* be, GncSqlRow* row, BookLookupFn looku guid = load_obj_guid( be, row ); g_return_if_fail( guid != NULL ); - inst = lookup_fn( guid, be->primary_book ); + inst = lookup_fn( guid, be->book ); g_return_if_fail( inst != NULL ); slot_info.be = be; diff --git a/src/backend/sql/gnc-tax-table-sql.c b/src/backend/sql/gnc-tax-table-sql.c index 0e16d32174..f9f6f291ed 100644 --- a/src/backend/sql/gnc-tax-table-sql.c +++ b/src/backend/sql/gnc-tax-table-sql.c @@ -292,10 +292,10 @@ load_single_taxtable( GncSqlBackend* be, GncSqlRow* row, g_return_if_fail( row != NULL ); guid = gnc_sql_load_guid( be, row ); - tt = gncTaxTableLookup( be->primary_book, guid ); + tt = gncTaxTableLookup( be->book, guid ); if ( tt == NULL ) { - tt = gncTaxTableCreate( be->primary_book ); + tt = gncTaxTableCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_TAXTABLE, tt, tt_col_table ); gnc_sql_slots_load( be, QOF_INSTANCE(tt) ); @@ -528,7 +528,7 @@ write_taxtables( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_TAXTABLE, be->primary_book, save_next_taxtable, &data ); + qof_object_foreach( GNC_ID_TAXTABLE, be->book, save_next_taxtable, &data ); return data.is_ok; } @@ -552,7 +552,7 @@ load_taxtable_guid( const GncSqlBackend* be, GncSqlRow* row, if ( val != NULL && G_VALUE_HOLDS_STRING( val ) && g_value_get_string( val ) != NULL ) { string_to_guid( g_value_get_string( val ), &guid ); - taxtable = gncTaxTableLookup( be->primary_book, &guid ); + taxtable = gncTaxTableLookup( be->book, &guid ); if ( taxtable != NULL ) { if ( table_row->gobj_param_name != NULL ) diff --git a/src/backend/sql/gnc-transaction-sql.c b/src/backend/sql/gnc-transaction-sql.c index 557bae5e14..8ad5490dc2 100644 --- a/src/backend/sql/gnc-transaction-sql.c +++ b/src/backend/sql/gnc-transaction-sql.c @@ -210,10 +210,10 @@ load_single_split( GncSqlBackend* be, GncSqlRow* row ) if ( guid == NULL ) return NULL; split_guid = *guid; - pSplit = xaccSplitLookup( &split_guid, be->primary_book ); + pSplit = xaccSplitLookup( &split_guid, be->book ); if ( pSplit == NULL ) { - pSplit = xaccMallocSplit( be->primary_book ); + pSplit = xaccMallocSplit( be->book ); } /* If the split is dirty, don't overwrite it */ @@ -222,7 +222,7 @@ load_single_split( GncSqlBackend* be, GncSqlRow* row ) gnc_sql_load_object( be, row, GNC_ID_SPLIT, pSplit, split_col_table ); } - /*# -ifempty */g_assert( pSplit == xaccSplitLookup( &split_guid, be->primary_book ) ); + /*# -ifempty */g_assert( pSplit == xaccSplitLookup( &split_guid, be->book ) ); return pSplit; } @@ -287,17 +287,17 @@ load_single_tx( GncSqlBackend* be, GncSqlRow* row ) tx_guid = *guid; // Don't overwrite the transaction if it's already been loaded (and possibly modified). - pTx = xaccTransLookup( &tx_guid, be->primary_book ); + pTx = xaccTransLookup( &tx_guid, be->book ); if ( pTx != NULL ) { return NULL; } - pTx = xaccMallocTransaction( be->primary_book ); + pTx = xaccMallocTransaction( be->book ); xaccTransBeginEdit( pTx ); gnc_sql_load_object( be, row, GNC_ID_TRANS, pTx, tx_col_table ); - g_assert( pTx == xaccTransLookup( &tx_guid, be->primary_book ) ); + g_assert( pTx == xaccTransLookup( &tx_guid, be->book ) ); return pTx; } @@ -389,7 +389,7 @@ query_transactions( GncSqlBackend* be, GncSqlStatement* stmt ) Transaction* tx; GSList* bal_list = NULL; GSList* nextbal; - Account* root = gnc_book_get_root_account( be->primary_book ); + Account* root = gnc_book_get_root_account( be->book ); #if LOAD_TRANSACTIONS_AS_NEEDED qof_event_suspend(); @@ -1335,7 +1335,7 @@ set_acct_bal_account_from_guid( gpointer pObject, gpointer pValue ) g_return_if_fail( pObject != NULL ); g_return_if_fail( pValue != NULL ); - bal->acct = xaccAccountLookup( guid, bal->be->primary_book ); + bal->acct = xaccAccountLookup( guid, bal->be->book ); } static void @@ -1498,7 +1498,7 @@ load_tx_guid( const GncSqlBackend* be, GncSqlRow* row, if ( guid_str != NULL ) { (void)string_to_guid( guid_str, &guid ); - tx = xaccTransLookup( &guid, be->primary_book ); + tx = xaccTransLookup( &guid, be->book ); // If the transaction is not found, try loading it if ( tx == NULL ) @@ -1511,7 +1511,7 @@ load_tx_guid( const GncSqlBackend* be, GncSqlRow* row, stmt = gnc_sql_create_statement_from_sql( (GncSqlBackend*)be, buf ); g_free( buf ); query_transactions( (GncSqlBackend*)be, stmt ); - tx = xaccTransLookup( &guid, be->primary_book ); + tx = xaccTransLookup( &guid, be->book ); } if ( tx != NULL ) diff --git a/src/backend/sql/gnc-vendor-sql.c b/src/backend/sql/gnc-vendor-sql.c index 12695d1e2d..cb60dc2153 100644 --- a/src/backend/sql/gnc-vendor-sql.c +++ b/src/backend/sql/gnc-vendor-sql.c @@ -93,10 +93,10 @@ load_single_vendor( GncSqlBackend* be, GncSqlRow* row ) g_return_val_if_fail( row != NULL, NULL ); guid = gnc_sql_load_guid( be, row ); - pVendor = gncVendorLookup( be->primary_book, guid ); + pVendor = gncVendorLookup( be->book, guid ); if ( pVendor == NULL ) { - pVendor = gncVendorCreate( be->primary_book ); + pVendor = gncVendorCreate( be->book ); } gnc_sql_load_object( be, row, GNC_ID_VENDOR, pVendor, col_table ); qof_instance_mark_clean( QOF_INSTANCE(pVendor) ); @@ -113,7 +113,7 @@ load_all_vendors( GncSqlBackend* be ) g_return_if_fail( be != NULL ); - pBook = be->primary_book; + pBook = be->book; stmt = gnc_sql_create_select_statement( be, TABLE_NAME ); result = gnc_sql_execute_select_statement( be, stmt ); @@ -256,7 +256,7 @@ write_vendors( GncSqlBackend* be ) data.be = be; data.is_ok = TRUE; - qof_object_foreach( GNC_ID_VENDOR, be->primary_book, write_single_vendor, &data ); + qof_object_foreach( GNC_ID_VENDOR, be->book, write_single_vendor, &data ); return data.is_ok; } diff --git a/src/backend/xml/gnc-backend-xml.c b/src/backend/xml/gnc-backend-xml.c index ea22ee4cb6..b7d291a34c 100644 --- a/src/backend/xml/gnc-backend-xml.c +++ b/src/backend/xml/gnc-backend-xml.c @@ -378,7 +378,7 @@ xml_session_end(QofBackend *be_start) FileBackend *be = (FileBackend*)be_start; ENTER (" "); - if ( be->primary_book && qof_book_is_readonly( be->primary_book ) ) + if ( be->book && qof_book_is_readonly( be->book ) ) { qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY ); return; @@ -959,20 +959,18 @@ static void xml_sync_all(QofBackend* be, QofBook *book) { FileBackend *fbe = (FileBackend *) be; - ENTER ("book=%p, primary=%p", book, fbe->primary_book); + ENTER ("book=%p, fbe->book=%p", book, fbe->book); /* We make an important assumption here, that we might want to change * in the future: when the user says 'save', we really save the one, - * the only, the current open book, and nothing else. We do this - * because we assume that any other books that we are dealing with - * are 'read-only', non-editable, because they are closed books. - * If we ever want to have more than one book open read-write, - * this will have to change. + * the only, the current open book, and nothing else. In any case the plans + * for multiple books have been removed in the meantime and there is just one + * book, no more. */ - if (NULL == fbe->primary_book) fbe->primary_book = book; - if (book != fbe->primary_book) return; + if (NULL == fbe->book) fbe->book = book; + if (book != fbe->book) return; - if (qof_book_is_readonly( fbe->primary_book ) ) + if (qof_book_is_readonly( fbe->book ) ) { /* Are we read-only? Don't continue in this case. */ qof_backend_set_error( (QofBackend*)be, ERR_BACKEND_READONLY ); @@ -1102,7 +1100,7 @@ gnc_xml_be_load_from_file (QofBackend *bend, QofBook *book, QofBackendLoadType l if (loadType != LOAD_TYPE_INITIAL_LOAD) return; error = ERR_BACKEND_NO_ERR; - be->primary_book = book; + be->book = book; switch (gnc_xml_be_determine_file_type(be->fullpath)) { @@ -1282,7 +1280,7 @@ gnc_backend_new(void) gnc_be->linkfile = NULL; gnc_be->lockfd = -1; - gnc_be->primary_book = NULL; + gnc_be->book = NULL; gnc_be->file_retention_days = (int)gnc_gconf_get_float(GCONF_GENERAL, KEY_RETAIN_DAYS, NULL); gnc_be->file_compression = gnc_gconf_get_bool(GCONF_GENERAL, KEY_FILE_COMPRESSION, NULL); diff --git a/src/backend/xml/gnc-backend-xml.h b/src/backend/xml/gnc-backend-xml.h index d0cb97f873..959956a363 100644 --- a/src/backend/xml/gnc-backend-xml.h +++ b/src/backend/xml/gnc-backend-xml.h @@ -53,7 +53,7 @@ struct FileBackend_struct char *linkfile; int lockfd; - QofBook *primary_book; /* The primary, main open book */ + QofBook *book; /* The primary, main open book */ XMLFileRetentionType file_retention_type; int file_retention_days;