#3167 CSV parser. Try a fallback datetime format if parsing fails

This commit is contained in:
Bjørn Erik Jensen
2018-07-06 15:01:25 +02:00
parent 08f516bab4
commit 60146be146
3 changed files with 14 additions and 1 deletions

View File

@@ -311,7 +311,14 @@ bool RifCsvUserDataParser::parseData(const AsciiDataParseOptions& parseOptions)
if (!dt.isValid() && !parseOptions.useCustomDateTimeFormat)
{
// Try to match date format only
dt = tryParseDateTime(colData.toStdString(), parseOptions.dateFormat);
if (parseOptions.dateFormat != parseOptions.dateTimeFormat)
{
dt = tryParseDateTime(colData.toStdString(), parseOptions.dateFormat);
}
if (!dt.isValid() && !parseOptions.fallbackDateTimeFormat.isEmpty())
{
dt = tryParseDateTime(colData.toStdString(), parseOptions.fallbackDateTimeFormat);
}
}
if (!dt.isValid())