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

Made sure an exception is also thrown for too few columns. Added a test for this use case.

Browse Source
This commit is contained in:
rubenthoms
2020-08-14 18:08:35 +02:00
committed by rubenthoms
parent 3a5ef7fb86
commit 0da301a785
4 changed files with 4360 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/FileInterface/RifElementPropertyTableReader.cpp
View File

@@ -111,8 +111,9 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
if ( file && expectedColumnCount > 0 )
{
QTextStream stream( file );
bool dataBlockFound = false;
int lineNo = 0;
bool dataBlockFound = false;
bool completeDataLineFound = false;
int lineNo = 0;
QStringList collectedCols;
// Init data vectors
@@ -126,6 +127,11 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
{
if ( collectedCols.size() > 0 && collectedCols.size() != 8 )
{
if ( dataBlockFound )
{
throw FileParseException(
QString( "Number of columns mismatch at %1:%2" ).arg( metadata->fileName ).arg( lineNo ) );
}
collectedCols.clear();
}
@@ -137,10 +143,11 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
}
lineNo++;
if ( !dataBlockFound )
if ( !completeDataLineFound )
{
if ( !line.startsWith( "*" ) && !line.startsWith( "," ) && collectedCols.size() == expectedColumnCount )
{
completeDataLineFound = true;
dataBlockFound = true;
}
else if ( collectedCols.size() > expectedColumnCount )
@@ -185,7 +192,7 @@ void RifElementPropertyTableReader::readData( const RifElementPropertyMetadata*
}
}
collectedCols.clear();
dataBlockFound = false;
completeDataLineFound = false;
}
table->hasData = true;