// Author: Vitaly SMETANNIKOV
#include <ExchangePlugin_Validators.h>
+
+#include <ExchangePlugin_Tools.h>
+
#include <ModelAPI_Feature.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Session.h>
#include <list>
#include <string>
-#include <sstream>
#include <algorithm>
bool ExchangePlugin_FormatValidator::parseFormats(const std::list<std::string>& theArguments,
result = false;
continue;
}
- std::string aFormatList = anArg.substr(0, aSepPos);
- std::transform(aFormatList.begin(), aFormatList.end(), aFormatList.begin(), toupper);
- std::istringstream aStream(aFormatList);
- std::string aFormat;
- while (std::getline(aStream, aFormat, '|'))
- outFormats.push_back(aFormat);
+ std::string aFormats = anArg.substr(0, aSepPos);
+ std::transform(aFormats.begin(), aFormats.end(), aFormats.begin(), toupper);
+ std::list<std::string> aFormatList = ExchangePlugin_Tools::split(aFormats, '|');
+ outFormats.insert(outFormats.end(), aFormatList.begin(), aFormatList.end());
}
return result;
}
std::transform(aFileName.begin(), aFileName.end(), aFileName.begin(), toupper);
// Is file name ends with the format
for (; itFormats != aFormats.end(); ++itFormats) {
- size_t aFormatBeginPos = aFileNameLen - (*itFormats).length();
- if (aFileName.compare(aFormatBeginPos, std::string::npos, *itFormats) == 0) {
- return true;
+ if (aFileNameLen > (*itFormats).length()) {
+ size_t aFormatBeginPos = aFileNameLen - (*itFormats).length();
+ if (aFileName.compare(aFormatBeginPos, std::string::npos, *itFormats) == 0) {
+ return true;
+ }
}
}
return false;