Make CSV importer more sensitive to errors
This commit is contained in:
parent
4a18317e7c
commit
4ebcce3067
1 changed files with 68 additions and 68 deletions
18
src/csv.cc
18
src/csv.cc
|
|
@ -132,7 +132,6 @@ void csv_reader::read_index(std::istream& sin)
|
|||
|
||||
xact_t * csv_reader::read_xact(journal_t& journal, account_t * bucket)
|
||||
{
|
||||
restart:
|
||||
char * line = next_line(in);
|
||||
if (! line || index.empty())
|
||||
return NULL;
|
||||
|
|
@ -166,20 +165,15 @@ xact_t * csv_reader::read_xact(journal_t& journal, account_t * bucket)
|
|||
std::vector<int>::size_type n = 0;
|
||||
amount_t amt;
|
||||
string total;
|
||||
string field;
|
||||
|
||||
try {
|
||||
while (instr.good() && ! instr.eof()) {
|
||||
string field = read_field(instr);
|
||||
field = read_field(instr);
|
||||
|
||||
switch (index[n]) {
|
||||
case FIELD_DATE:
|
||||
if (field.empty())
|
||||
goto restart;
|
||||
try {
|
||||
xact->_date = parse_date(field);
|
||||
}
|
||||
catch (date_error&) {
|
||||
goto restart;
|
||||
}
|
||||
break;
|
||||
|
||||
case FIELD_DATE_EFF:
|
||||
|
|
@ -242,6 +236,12 @@ xact_t * csv_reader::read_xact(journal_t& journal, account_t * bucket)
|
|||
}
|
||||
n++;
|
||||
}
|
||||
}
|
||||
catch (const std::exception&) {
|
||||
add_error_context(_("While parsing CSV field:"));
|
||||
add_error_context(line_context(field));
|
||||
throw;
|
||||
}
|
||||
|
||||
#if 0
|
||||
xact->set_tag(_("Imported"),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue