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

Introduce parse error state

Browse Source
This commit is contained in:
Geert Janssens 2016-06-12 12:41:51 +02:00 committed by Geert Janssens
parent 0f6dc53cd1
commit 142fb61724
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,6 +230,7 @@ GncCsvParseData::GncCsvParseData(GncImpFileFormat format)
start_row = 0;
end_row = 1000;
skip_rows = FALSE;
parse_errors = false;
file_fmt = format;
tokenizer = GncTokenizerFactory(file_fmt);
@ -899,6 +900,7 @@ int GncCsvParseData::parse_to_trans (Account* account,
Account *home_account = NULL;
bool odd_line = false;
parse_errors = false;
for (orig_lines_it, odd_line;
orig_lines_it != orig_lines_max;
++orig_lines_it, odd_line = !odd_line)
@ -931,6 +933,7 @@ int GncCsvParseData::parse_to_trans (Account* account,
if (home_account == NULL)
{
parse_errors = true;
orig_lines_it->second = _("Account column could not be understood.");
continue;
}
@ -952,7 +955,7 @@ int GncCsvParseData::parse_to_trans (Account* account,
trans_property_list_add (property);
else
{
loop_err = true;
parse_errors = loop_err = true;
gchar *error_message = g_strdup_printf (_("%s column could not be understood."),
_(gnc_csv_col_type_strs[property->type]));
orig_lines_it->second = error_message;
@ -972,6 +975,7 @@ int GncCsvParseData::parse_to_trans (Account* account,
trans_line = trans_property_list_to_trans (list, &error_message);
if (trans_line == NULL)
{
parse_errors = true;
orig_lines_it->second = error_message;
g_free (error_message);
trans_property_list_free (list);

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

@ -135,6 +135,7 @@ public:
guint end_row; /**< The end row to generate transactions from. */
gboolean skip_rows; /**< Skip Alternate Rows from start row. */
int currency_format; /**< The currency format, 0 for locale, 1 for comma dec and 2 for period */
bool parse_errors; /**< Indicates whether the last parse_to_trans run had any errors */
private:
GncImpFileFormat file_fmt = GncImpFileFormat::UNKNOWN;