OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed behaviour when same keyword occurs again, delete existing entry, replace with new.

Browse Source
This commit is contained in:
Kristian Flikka 2014-11-18 11:51:35 +01:00
parent 71e8321d7c
commit 83a1016aaf
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
opm/parser/eclipse/Parser/createDefaultKeywordList.cpp
View File

@ -207,8 +207,9 @@ static void scanKeyword(const boost::filesystem::path& file , KeywordMapType& ke
KeywordMapType::iterator existingEntry = keywordMap.find(internalName); KeywordMapType::iterator existingEntry = keywordMap.find(internalName);
bool alreadyExists = existingEntry != keywordMap.end(); bool alreadyExists = existingEntry != keywordMap.end();
if (alreadyExists) { if (alreadyExists) {
std::cerr << "Warning: Ignoring the the keyword " << internalName << " in '" << file.string() << "'," << std::endl std::cerr << "Warning: Ignoring the the keyword " << internalName << " found in '" << existingEntry->second.first << "'," << std::endl
<< "\tit has already been read from '" << existingEntry->second.first << "'" << std::endl; << "\treplacing it with data from '" << file.string() << "'" << std::endl;
keywordMap.erase(existingEntry);
} }
Json::JsonObject * jsonKeyword; Json::JsonObject * jsonKeyword;
@ -234,8 +235,8 @@ static void scanKeyword(const boost::filesystem::path& file , KeywordMapType& ke
} }
static void scanAllKeywords(const boost::filesystem::path& directory , KeywordMapType& keywordMap) { static void scanAllKeywords(const boost::filesystem::path& directory , KeywordMapType& keywordMap) {
boost::filesystem::directory_iterator end; boost::filesystem::directory_iterator end_iterator;
for (boost::filesystem::directory_iterator iter(directory); iter != end; iter++) { for (boost::filesystem::directory_iterator iter(directory); iter != end_iterator; iter++) {
if (boost::filesystem::is_directory(*iter)) if (boost::filesystem::is_directory(*iter))
scanAllKeywords(*iter , keywordMap); scanAllKeywords(*iter , keywordMap);
else else
@ -268,8 +269,8 @@ static std::vector<boost::filesystem::path> getPathsInAlfanumOrder(const char* c
{ {
boost::filesystem::path root(config_root); boost::filesystem::path root(config_root);
std::vector<std::string> paths_in_root; std::vector<std::string> paths_in_root;
boost::filesystem::directory_iterator end; boost::filesystem::directory_iterator end_iterator;
for (boost::filesystem::directory_iterator iter(root); iter != end; iter++) { for (boost::filesystem::directory_iterator iter(root); iter != end_iterator; iter++) {
if (boost::filesystem::is_directory(*iter)) { if (boost::filesystem::is_directory(*iter)) {
paths_in_root.push_back(iter->path().string()); paths_in_root.push_back(iter->path().string());
} }