From 0bd50546a8d06a6865d32c695adf8893fa71250a Mon Sep 17 00:00:00 2001 From: Patrick Benavoli Date: Tue, 29 Nov 2011 11:10:27 +0100 Subject: PFW: Rule handling from CLI BZ: 15689 These changes enable handling changing the rules for configuration application from the command line interface. It is possible to assign a new rule, to display the existing one or to clear it. Restriction: like in XML, root rule must be compound. Syntax is the following: - Criterion rule expression: - Compound rule expression (All|Any){} where is a comma separated list of any kind of rules. Example: All{Any{SelectedOutputDevice Includes Headphones, SelectedOutputDevice Includes Headset}, Any{Mode Is Normal, Mode Is RingTone}} means the pertaining configuration will be applied when Selected device includes either Headphones or Headset, while, ate the same time, Mode is either Normal or RingTone. Added dumpDomains remote command to show a summary of domains, configurations as well as their application conditions (tree view). Removed not anymore necessary guard against deletion of domains or configurations that contain rules, ad now they're controlled from the CLI. Change-Id: Iad2c183271b077b8bbc8ac2fc5f37c266004070f Signed-off-by: Patrick Benavoli Reviewed-on: http://android.intel.com:8080/26100 Reviewed-by: De Chivre, RenaudX Tested-by: Barthes, FabienX Reviewed-by: buildbot Tested-by: buildbot --- parameter/SelectionCriterionRule.cpp | 73 ++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'parameter/SelectionCriterionRule.cpp') diff --git a/parameter/SelectionCriterionRule.cpp b/parameter/SelectionCriterionRule.cpp index bb353bd..e25cc07 100644 --- a/parameter/SelectionCriterionRule.cpp +++ b/parameter/SelectionCriterionRule.cpp @@ -33,6 +33,7 @@ #include "XmlDomainSerializingContext.h" #include "SelectionCriteriaDefinition.h" #include "SelectionCriterionTypeInterface.h" +#include "RuleParser.h" #include #define base CRule @@ -54,6 +55,78 @@ string CSelectionCriterionRule::getKind() const return "SelectionCriterionRule"; } +// Content dumping +void CSelectionCriterionRule::logValue(string& strValue, CErrorContext& errorContext) const +{ + (void)errorContext; + + // Dump rule + dump(strValue); +} + +// Parse +bool CSelectionCriterionRule::parse(CRuleParser& ruleParser, string& strError) +{ + // Criterion + _pSelectionCriterion = ruleParser.getSelectionCriteriaDefinition()->getSelectionCriterion(ruleParser.getType()); + + // Check existence + if (!_pSelectionCriterion) { + + strError = "Couldn't find selection criterion " + ruleParser.getType(); + + return false; + } + + // Verb + string strMatchesWhen; + + if (!ruleParser.next(strMatchesWhen, strError)) { + + return false; + } + // Value + string strValue; + + if (!ruleParser.next(strValue, strError)) { + + return false; + } + + // Matches when + if (!setMatchesWhen(strMatchesWhen, strError)) { + + strError = "Verb error: " + strError; + + return false; + } + + // Value + if (!_pSelectionCriterion->getCriterionType()->getNumericalValue(strValue, _iMatchValue)) { + + strError = "Value error: " + strError; + + return false; + } + + return true; +} + +// Dump +void CSelectionCriterionRule::dump(string& strResult) const +{ + // Criterion + strResult += _pSelectionCriterion->getName(); + strResult += " "; + // Verb + strResult += _astMatchesWhen[_eMatchesWhen].pcMatchesWhen; + strResult += " "; + // Value + string strValue; + _pSelectionCriterion->getCriterionType()->getLiteralValue(_iMatchValue, strValue); + strResult += strValue; +} + // Rule check bool CSelectionCriterionRule::matches() const { -- cgit v1.1