OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

CSV import. Insert HUGE_VAL in numeric column on parse error

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-11-27 08:42:30 +01:00
parent 4299a2ba5e
commit 7add91b1d6
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
View File

@ -169,7 +169,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
// Parse header // Parse header
if (!parseColumnInfo(dataStream, parseOptions.cellSeparator, &columnInfoList)) if (!parseColumnInfo(dataStream, parseOptions.cellSeparator, &columnInfoList))
{ {
m_errorText->append("Failed to parse column headers"); m_errorText->append("CSV import: Failed to parse header columns");
return false; return false;
} }
@ -183,7 +183,7 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
if(lineColumns.size() != colCount) if(lineColumns.size() != colCount)
{ {
m_errorText->append("CSV file has invalid content (Column count mismatch)"); m_errorText->append("CSV import: Varying number of columns");
errors = true; errors = true;
break; break;
} }
@ -229,7 +229,22 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
{ {
if (col.dataType == ColumnInfo::NUMERIC) if (col.dataType == ColumnInfo::NUMERIC)
{ {
col.values.push_back(parseOptions.locale.toDouble(colData)); bool parseOk = true;
double value = parseOptions.locale.toDouble(colData, &parseOk);
if (!parseOk)
{
// Find the error reason, wrong decimal sign or something else
if (RiaStdStringTools::isNumber(colData.toStdString(), '.') || RiaStdStringTools::isNumber(colData.toStdString(), ','))
{
m_errorText->append(QString("CSV import: Failed to parse numeric value in column %1\n").arg(QString::number(iCol + 1)));
throw 0;
}
// Add NULL value
value = HUGE_VAL;
}
col.values.push_back(value);
} }
else if (col.dataType == ColumnInfo::TEXT) else if (col.dataType == ColumnInfo::TEXT)
{ {
@ -246,13 +261,16 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
dt = tryParseDateTime(colData.toStdString(), parseOptions.dateFormat); dt = tryParseDateTime(colData.toStdString(), parseOptions.dateFormat);
} }
if (!dt.isValid()) throw 0; if (!dt.isValid())
{
m_errorText->append("CSV import: Failed to parse date time value");
throw 0;
}
col.dateTimeValues.push_back(dt); col.dateTimeValues.push_back(dt);
} }
} }
catch (...) catch (...)
{ {
m_errorText->append("CSV file has invalid content (Column type mismatch)");
errors = true; errors = true;
break; break;
} }