- static const std::string kAllTypes = "";
- std::map<std::string, std::map<std::string, AttrValidators> >::const_iterator aFeatureIter =
- myAttrs.find(theFeature->getKind());
- if (aFeatureIter != myAttrs.cend()) {
- std::list<std::string> aLtAttributes = aData->attributesIDs(kAllTypes);
- std::list<std::string>::iterator anAttrIter = aLtAttributes.begin();
- for (; anAttrIter != aLtAttributes.end(); anAttrIter++) {
- std::map<std::string, AttrValidators>::const_iterator anAttr =
- aFeatureIter->second.find(*anAttrIter);
- if (anAttr != aFeatureIter->second.end()) {
- AttrValidators::const_iterator aValIter = anAttr->second.cbegin();
- for (; aValIter != anAttr->second.cend(); aValIter++) {
- std::map<std::string, ModelAPI_Validator*>::const_iterator aFound = myIDs.find(
- aValIter->first);
- if (aFound == myIDs.end()) {
- Events_Error::send(std::string("Validator ") + aValIter->first + " was not registered");
- } else {
- const ModelAPI_AttributeValidator* anAttrValidator =
- dynamic_cast<const ModelAPI_AttributeValidator*>(aFound->second);
- if (anAttrValidator) {
- if (!anAttrValidator->isValid(theFeature->data()->attribute(*anAttrIter),
- aValIter->second)) {
- return false;
- }
- }
- }
+ }
+
+ // skip not-case attributes, that really may be invalid (issue 671)
+ if (!const_cast<Model_ValidatorsFactory*>(this)->isCase(aFeature, theAttribute->id()))
+ return true;
+
+ Validators aValidators;
+ validators(aFeature->getKind(), theAttribute->id(), aValidators);
+
+ Validators::iterator aValidatorIt = aValidators.begin();
+ for (; aValidatorIt != aValidators.end(); ++aValidatorIt) {
+ const std::string& aValidatorID = aValidatorIt->first;
+ const std::list<std::string>& anArguments = aValidatorIt->second;
+ const ModelAPI_AttributeValidator* anAttrValidator =
+ dynamic_cast<const ModelAPI_AttributeValidator*>(validator(aValidatorID));
+ if (!anAttrValidator)
+ continue;
+ if (!anAttrValidator->isValid(theAttribute, anArguments, theError)) {
+ theValidator = aValidatorID;
+ return false;
+ }
+ }
+
+ return true;
+}
+
+void Model_ValidatorsFactory::registerNotObligatory(std::string theFeature,
+ std::string theAttribute)
+{
+ const static std::string kDefaultId = "Model_FeatureValidator";
+ std::map<std::string, ModelAPI_Validator*>::const_iterator it = myIDs.find(kDefaultId);
+ if (it != myIDs.end()) {
+ Model_FeatureValidator* aValidator = dynamic_cast<Model_FeatureValidator*>(it->second);
+ if (aValidator) {
+ aValidator->registerNotObligatory(theFeature, theAttribute);
+ }
+ }
+}
+
+bool Model_ValidatorsFactory::isNotObligatory(std::string theFeature, std::string theAttribute)
+{
+ const static std::string kDefaultId = "Model_FeatureValidator";
+ std::map<std::string, ModelAPI_Validator*>::const_iterator it = myIDs.find(kDefaultId);
+ if (it != myIDs.end()) {
+ Model_FeatureValidator* aValidator = dynamic_cast<Model_FeatureValidator*>(it->second);
+ if (aValidator) {
+ return aValidator->isNotObligatory(theFeature, theAttribute);
+ }
+ }
+ return false; // default
+}
+
+void Model_ValidatorsFactory::registerConcealment(std::string theFeature, std::string theAttribute)
+{
+ std::map<std::string, std::set<std::string> >::iterator aFind = myConcealed.find(theFeature);
+ if (aFind == myConcealed.end()) {
+ std::set<std::string> aNewSet;
+ aNewSet.insert(theAttribute);
+ myConcealed[theFeature] = aNewSet;
+ } else {
+ aFind->second.insert(theAttribute);
+ }
+}
+
+bool Model_ValidatorsFactory::isConcealed(std::string theFeature, std::string theAttribute)
+{
+ std::map<std::string, std::set<std::string> >::iterator aFind = myConcealed.find(theFeature);
+ return aFind != myConcealed.end() && aFind->second.find(theAttribute) != aFind->second.end();
+}
+
+void Model_ValidatorsFactory::registerCase(std::string theFeature, std::string theAttribute,
+ const std::list<std::pair<std::string, std::string> >& theCases)
+{
+ std::map<std::string, std::map<std::string, std::map<std::string, std::set<std::string> > > >
+ ::iterator aFindFeature = myCases.find(theFeature);
+ if (aFindFeature == myCases.end()) {
+ myCases[theFeature] = std::map<std::string, std::map<std::string, std::set<std::string> > >();
+ aFindFeature = myCases.find(theFeature);
+ }
+ std::map<std::string, std::map<std::string, std::set<std::string> > >::iterator aFindAttrID =
+ aFindFeature->second.find(theAttribute);
+
+ if (aFindAttrID == aFindFeature->second.end()) {
+ aFindFeature->second[theAttribute] =
+ std::map<std::string, std::set<std::string> >();
+ aFindAttrID = aFindFeature->second.find(theAttribute);
+ }
+ std::list<std::pair<std::string, std::string> >::const_iterator aCasesIt = theCases.begin(),
+ aCasesLast = theCases.end();
+ std::map<std::string, std::set<std::string> > aFindCases = aFindAttrID->second;
+ for (; aCasesIt != aCasesLast; aCasesIt++) {
+ std::pair<std::string, std::string> aCasePair = *aCasesIt;
+ std::string aSwitch = aCasePair.first;
+ if (aFindAttrID->second.find(aSwitch) == aFindAttrID->second.end()) {
+ aFindAttrID->second[aSwitch] = std::set<std::string>();
+ }
+ aFindAttrID->second[aSwitch].insert(aCasePair.second);
+ }
+}
+
+bool Model_ValidatorsFactory::isCase(FeaturePtr theFeature, std::string theAttribute)
+{
+ bool anInCase = true;
+ std::map<std::string, std::map<std::string, std::map<std::string, std::set<std::string> > > >
+ ::iterator aFindFeature = myCases.find(theFeature->getKind());
+ if (aFindFeature != myCases.end()) {
+ std::map<std::string, std::map<std::string, std::set<std::string> > >::iterator
+ aFindAttrID = aFindFeature->second.find(theAttribute);
+ if (aFindAttrID != aFindFeature->second.end()) {
+ std::map<std::string, std::set<std::string> >::iterator
+ aCasesIt = aFindAttrID->second.begin(), aCasesLast = aFindAttrID->second.end();
+ for (; aCasesIt != aCasesLast && anInCase; aCasesIt++) {
+ // the the switch-attribute that contains the case value
+ AttributeStringPtr aSwitch = theFeature->string(aCasesIt->first);
+ if (aSwitch.get()) {
+ // the second has the case identifier
+ anInCase = aCasesIt->second.find(aSwitch->value()) != aCasesIt->second.end();