Merge pull request #21 from krocard/Fix_error_message_in_case_of_unknown_criterion_value

dawagner · dawagner · commit f39078a6c340 · 2015-01-29T16:29:23.000+01:00
Fix error message in case of unknown criterion value
diff --git a/parameter/SelectionCriterionRule.cpp b/parameter/SelectionCriterionRule.cpp
@@ -106,7 +106,8 @@ bool CSelectionCriterionRule::parse(CRuleParser& ruleParser, string& strError)
     // Value
     if (!_pSelectionCriterion->getCriterionType()->getNumericalValue(strValue, _iMatchValue)) {
 
-        strError = "Value error: " + strError;
+        strError = "Value error: \"" + strValue + "\" is not part of criterion \"" +
+                   _pSelectionCriterion->getCriterionName() + "\"";
 
         return false;
     }

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,8 @@ bool CSelectionCriterionRule::parse(CRuleParser& ruleParser, string& strError)`
`106`	`106`	`// Value`
`107`	`107`	`if (!_pSelectionCriterion->getCriterionType()->getNumericalValue(strValue, _iMatchValue)) {`
`108`	`108`
`109`		`- strError = "Value error: " + strError;`
	`109`	`+ strError = "Value error: \"" + strValue + "\" is not part of criterion \"" +`
	`110`	`+ _pSelectionCriterion->getCriterionName() + "\"";`
`110`	`111`
`111`	`112`	`return false;`
`112`	`113`	`}`