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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.cpp
View File

@ -247,6 +247,11 @@ const AsciiDataParseOptions RicPasteAsciiDataToSummaryPlotFeatureUi::parseOption
parseOptions.dateTimeFormat = parseOptions.dateFormat +
(m_timeFormat() != TimeFormat::TIME_NONE ? " " + parseOptions.timeFormat : "");
}
if (m_timeFormat() == TimeFormat::TIME_NONE)
{
parseOptions.fallbackDateTimeFormat = parseOptions.dateFormat + " " +
RicPasteAsciiDataToSummaryPlotFeatureUi::TimeFormatEnum::text(TIME_HHMM);
}
}
parseOptions.timeSeriesColumnName = m_timeSeriesColumnName();

1
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h
View File

@ -48,6 +48,7 @@ public:
bool useCustomDateTimeFormat;
QString dateFormat;
QString timeFormat;
QString fallbackDateTimeFormat;
QString dateTimeFormat;
QString cellSeparator;
QString timeSeriesColumnName;

9
ApplicationCode/FileInterface/RifCsvUserDataParser.cpp
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())