sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make CSV importer more sensitive to errors

Browse source
This commit is contained in:
John Wiegley 2012-02-26 02:16:39 -06:00
parent 4a18317e7c
commit 4ebcce3067
1 changed files with 68 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
src/csv.cc
View file

@ -132,7 +132,6 @@ void csv_reader::read_index(std::istream& sin)
xact_t * csv_reader::read_xact(journal_t& journal, account_t * bucket) xact_t * csv_reader::read_xact(journal_t& journal, account_t * bucket)
{ {
restart:
char * line = next_line(in); char * line = next_line(in);
if (! line || index.empty()) if (! line || index.empty())
return NULL; return NULL;
@ -165,82 +164,83 @@ xact_t * csv_reader::read_xact(journal_t& journal, account_t * bucket)
std::vector<int>::size_type n = 0; std::vector<int>::size_type n = 0;
amount_t amt; amount_t amt;
string total; string total;
string field;
while (instr.good() && ! instr.eof()) { try {
string field = read_field(instr); while (instr.good() && ! instr.eof()) {
field = read_field(instr);
switch (index[n]) { switch (index[n]) {
case FIELD_DATE: case FIELD_DATE:
if (field.empty())
goto restart;
try {
xact->_date = parse_date(field); xact->_date = parse_date(field);
} break;
catch (date_error&) {
goto restart;
}
break;
case FIELD_DATE_EFF: case FIELD_DATE_EFF:
xact->_date_eff = parse_date(field); xact->_date_eff = parse_date(field);
break; break;
case FIELD_CODE: case FIELD_CODE:
if (! field.empty()) if (! field.empty())
xact->code = field; xact->code = field;
break; break;
case FIELD_PAYEE: { case FIELD_PAYEE: {
bool found = false; bool found = false;
foreach (payee_mapping_t& value, journal.payee_mappings) { foreach (payee_mapping_t& value, journal.payee_mappings) {
DEBUG("csv.mappings", "Looking for payee mapping: " << value.first); DEBUG("csv.mappings", "Looking for payee mapping: " << value.first);
if (value.first.match(field)) { if (value.first.match(field)) {
xact->payee = value.second; xact->payee = value.second;
found = true; found = true;
break; break;
}
} }
if (! found)
xact->payee = field;
break;
} }
if (! found)
xact->payee = field; case FIELD_AMOUNT: {
break; std::istringstream amount_str(field);
amt.parse(amount_str, PARSE_NO_REDUCE);
if (! amt.has_commodity() &&
commodity_pool_t::current_pool->default_commodity)
amt.set_commodity(*commodity_pool_t::current_pool->default_commodity);
post->amount = amt;
break;
}
case FIELD_COST: {
std::istringstream amount_str(field);
amt.parse(amount_str, PARSE_NO_REDUCE);
if (! amt.has_commodity() &&
commodity_pool_t::current_pool->default_commodity)
amt.set_commodity
(*commodity_pool_t::current_pool->default_commodity);
post->cost = amt;
break;
}
case FIELD_TOTAL:
total = field;
break;
case FIELD_NOTE:
xact->note = field;
break;
case FIELD_UNKNOWN:
if (! names[n].empty() && ! field.empty())
xact->set_tag(names[n], string_value(field));
break;
}
n++;
} }
}
case FIELD_AMOUNT: { catch (const std::exception&) {
std::istringstream amount_str(field); add_error_context(_("While parsing CSV field:"));
amt.parse(amount_str, PARSE_NO_REDUCE); add_error_context(line_context(field));
if (! amt.has_commodity() && throw;
commodity_pool_t::current_pool->default_commodity)
amt.set_commodity(*commodity_pool_t::current_pool->default_commodity);
post->amount = amt;
break;
}
case FIELD_COST: {
std::istringstream amount_str(field);
amt.parse(amount_str, PARSE_NO_REDUCE);
if (! amt.has_commodity() &&
commodity_pool_t::current_pool->default_commodity)
amt.set_commodity
(*commodity_pool_t::current_pool->default_commodity);
post->cost = amt;
break;
}
case FIELD_TOTAL:
total = field;
break;
case FIELD_NOTE:
xact->note = field;
break;
case FIELD_UNKNOWN:
if (! names[n].empty() && ! field.empty())
xact->set_tag(names[n], string_value(field));
break;
}
n++;
} }
#if 0 #if 0