IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use vector instead of GArray for column_types class member

Browse Source
This commit is contained in:
Geert Janssens 2015-05-08 21:59:00 +02:00 committed by Geert Janssens
parent 1507ec0c30
commit ce63d8aab0
2 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/import-export/csv-imp/gnc-csv-imp-trans.cpp
View File

@ -370,7 +370,6 @@ GncCsvParseData::GncCsvParseData()
raw_str.begin = raw_str.end = file_str.begin = file_str.end = NULL; raw_str.begin = raw_str.end = file_str.begin = file_str.end = NULL;
orig_lines = NULL; orig_lines = NULL;
orig_row_lengths = NULL; orig_row_lengths = NULL;
column_types = NULL;
error_lines = transactions = NULL; error_lines = transactions = NULL;
options = default_parse_options(); options = default_parse_options();
date_format = -1; date_format = -1;
@ -404,9 +403,6 @@ GncCsvParseData::~GncCsvParseData()
if (options != NULL) if (options != NULL)
stf_parse_options_free (options); stf_parse_options_free (options);
if (column_types != NULL)
g_array_free (column_types, TRUE);
if (error_lines != NULL) if (error_lines != NULL)
g_list_free (error_lines); g_list_free (error_lines);
@ -576,32 +572,25 @@ int GncCsvParseData::parse (gboolean guessColTypes, GError** error)
if (guessColTypes) if (guessColTypes)
{ {
/* Free column_types if it's already been created. */ /* Free column_types if it's already been created. */
if (column_types != NULL) column_types.clear();
g_array_free (column_types, TRUE);
/* Create column_types and fill it with guesses based /* Create column_types and fill it with guesses based
* on the contents of each column. */ * on the contents of each column. */
column_types = g_array_sized_new (FALSE, FALSE, sizeof(int),
max_cols);
g_array_set_size (column_types, max_cols);
/* TODO Make it actually guess. */ /* TODO Make it actually guess. */
for (i = 0; i < column_types->len; i++) for (i = 0; i < max_cols; i++)
{ {
column_types->data[i] = GNC_CSV_NONE; column_types.push_back(GNC_CSV_NONE);
} }
} }
else else
{ {
/* If we don't need to guess column types, we will simply set any /* If we don't need to guess column types, we will simply set any
* new columns that are created that didn't exist before to "None" * new columns that are created that didn't exist before to "None"
* since we don't want gibberish to appear. Note: * since we don't want gibberish to appear. */
* column_types should have already been i = column_types.size();
* initialized, so we don't check for it being NULL. */ for (; i < max_cols; i++)
i = column_types->len;
g_array_set_size (column_types, max_cols);
for (; i < column_types->len; i++)
{ {
column_types->data[i] = GNC_CSV_NONE; column_types.push_back(GNC_CSV_NONE);
} }
} }
return 0; return 0;
@ -1163,7 +1152,7 @@ int GncCsvParseData::parse_to_trans (Account* account,
for (j = 0; j < line->len; j++) for (j = 0; j < line->len; j++)
{ {
/* Look for "Account" columns. */ /* Look for "Account" columns. */
if (column_types->data[j] == GNC_CSV_ACCOUNT) if (column_types[j] == GNC_CSV_ACCOUNT)
{ {
home_account = gnc_csv_account_map_search ((gchar*) line->pdata[j]); home_account = gnc_csv_account_map_search ((gchar*) line->pdata[j]);
} }
@ -1182,10 +1171,10 @@ int GncCsvParseData::parse_to_trans (Account* account,
for (j = 0; j < line->len; j++) for (j = 0; j < line->len; j++)
{ {
/* We do nothing in "None" or "Account" columns. */ /* We do nothing in "None" or "Account" columns. */
if ((column_types->data[j] != GNC_CSV_NONE) && (column_types->data[j] != GNC_CSV_ACCOUNT)) if ((column_types[j] != GNC_CSV_NONE) && (column_types[j] != GNC_CSV_ACCOUNT))
{ {
/* Affect the transaction appropriately. */ /* Affect the transaction appropriately. */
TransProperty* property = trans_property_new (column_types->data[j], list); TransProperty* property = trans_property_new (column_types[j], list);
gboolean succeeded = trans_property_set (property, (gchar *) line->pdata[j]); gboolean succeeded = trans_property_set (property, (gchar *) line->pdata[j]);
/* TODO Maybe move error handling to within TransPropertyList functions? */ /* TODO Maybe move error handling to within TransPropertyList functions? */
@ -1290,9 +1279,9 @@ int GncCsvParseData::parse_to_trans (Account* account,
/* If we have a balance column, set the appropriate amounts on the transactions. */ /* If we have a balance column, set the appropriate amounts on the transactions. */
hasBalanceColumn = FALSE; hasBalanceColumn = FALSE;
for (i = 0; i < column_types->len; i++) for (i = 0; i < column_types.size(); i++)
{ {
if (column_types->data[i] == GNC_CSV_BALANCE) if (column_types[i] == GNC_CSV_BALANCE)
{ {
hasBalanceColumn = TRUE; hasBalanceColumn = TRUE;
break; break;
@ -1367,12 +1356,10 @@ int GncCsvParseData::parse_to_trans (Account* account,
if (max_cols < ((GPtrArray*)(orig_lines->pdata[i]))->len) if (max_cols < ((GPtrArray*)(orig_lines->pdata[i]))->len)
max_cols = ((GPtrArray*)(orig_lines->pdata[i]))->len; max_cols = ((GPtrArray*)(orig_lines->pdata[i]))->len;
} }
i = column_types->len; i = column_types.size();
column_types = g_array_set_size (column_types, max_cols);
for (; i < max_cols; i++) for (; i < max_cols; i++)
{ column_types.push_back(GNC_CSV_NONE);
column_types->data[i] = GNC_CSV_NONE;
}
return 0; return 0;
} }
@ -1381,11 +1368,11 @@ bool
GncCsvParseData::check_for_column_type (int type) GncCsvParseData::check_for_column_type (int type)
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
int j, ncols = column_types->len; /* ncols is the number of columns in the data. */ int j, ncols = column_types.size(); /* ncols is the number of columns in the data. */
for (j = 0; j < ncols; j++) for (j = 0; j < ncols; j++)
{ {
if (column_types->data[j] == type) if (column_types[j] == type)
ret = TRUE; ret = TRUE;
} }
return ret; return ret;

6
src/import-export/csv-imp/gnc-csv-imp-trans.hpp
View File

@ -34,9 +34,11 @@ extern "C" {
#include "Account.h" #include "Account.h"
#include "Transaction.h" #include "Transaction.h"
#include "stf/stf-parse.h"
} }
#include "stf/stf-parse.h" #include <vector>
/** Enumeration for column types. These are the different types of /** Enumeration for column types. These are the different types of
* columns that can exist in a CSV/Fixed-Width file. There should be * columns that can exist in a CSV/Fixed-Width file. There should be
@ -132,7 +134,7 @@ public:
int orig_max_row; /**< Holds the maximum value in orig_row_lengths */ int orig_max_row; /**< Holds the maximum value in orig_row_lengths */
GList* error_lines; /**< List of row numbers in orig_lines that have errors */ GList* error_lines; /**< List of row numbers in orig_lines that have errors */
StfParseOptions_t* options; /**< Options controlling how file_str should be parsed */ StfParseOptions_t* options; /**< Options controlling how file_str should be parsed */
GArray* column_types; /**< Array of values from the GncCsvColumnType enumeration */ std::vector<GncCsvColumnType> column_types; /**< Vector of values from the GncCsvColumnType enumeration */
GList* transactions; /**< List of GncCsvTransLine*s created using orig_lines and column_types */ GList* transactions; /**< List of GncCsvTransLine*s created using orig_lines and column_types */
int date_format; /**< The format of the text in the date columns from date_format_internal. */ int date_format; /**< The format of the text in the date columns from date_format_internal. */
guint start_row; /**< The start row to generate transactions from. */ guint start_row; /**< The start row to generate transactions from. */