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

#7633 Summary Reader : Resolve symlinks for h5 file management

Browse Source
This commit is contained in:
Magne Sjaastad 2021-04-28 11:26:28 +02:00
parent 1cf1eef048
commit 536e656684
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@ -364,9 +364,6 @@ ecl_sum_type* RifEclipseSummaryTools::openEclSum( const QString& inHeaderFileNam
if ( headerFileName.isEmpty() || dataFileNames.isEmpty() ) return nullptr; if ( headerFileName.isEmpty() || dataFileNames.isEmpty() ) return nullptr;
assert( !headerFileName.isEmpty() );
assert( dataFileNames.size() > 0 );
stringlist_type* dataFiles = stringlist_alloc_new(); stringlist_type* dataFiles = stringlist_alloc_new();
for ( int i = 0; i < dataFileNames.size(); i++ ) for ( int i = 0; i < dataFileNames.size(); i++ )
{ {

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@ -465,7 +465,9 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vector<RimFileS
auto headerFileName = fileSummaryCase->summaryHeaderFilename(); auto headerFileName = fileSummaryCase->summaryHeaderFilename();
QFileInfo fi( headerFileName ); QFileInfo fi( headerFileName );
QString h5FilenameCandidate = fi.absolutePath() + "/" + fi.baseName() + ".h5";
// NB! Use canonicalPath to make sure any symlinks are resolved to absolute file paths
QString h5FilenameCandidate = fi.canonicalPath() + "/" + fi.baseName() + ".h5";
headerFileNames.push_back( headerFileName.toStdString() ); headerFileNames.push_back( headerFileName.toStdString() );
h5FileNames.push_back( h5FilenameCandidate.toStdString() ); h5FileNames.push_back( h5FilenameCandidate.toStdString() );