diff options
author | Patrick Benavoli <patrickx.benavoli@intel.com> | 2011-11-29 11:10:27 +0100 |
---|---|---|
committer | David Wagner <david.wagner@intel.com> | 2014-02-10 17:15:01 +0100 |
commit | 0bd50546a8d06a6865d32c695adf8893fa71250a (patch) | |
tree | 966dc5c4c8143df983668db92db26129eafb1e3b /parameter/DomainConfiguration.cpp | |
parent | e7a903ef0a5ee2b9d51e6f86d32c704b9ff16c21 (diff) | |
download | external_parameter-framework-0bd50546a8d06a6865d32c695adf8893fa71250a.zip external_parameter-framework-0bd50546a8d06a6865d32c695adf8893fa71250a.tar.gz external_parameter-framework-0bd50546a8d06a6865d32c695adf8893fa71250a.tar.bz2 |
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:
<criterion> <verb> <object>
- Compound rule expression
(All|Any){<content>}
where <content> 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 <patrickx.benavoli@intel.com>
Reviewed-on: http://android.intel.com:8080/26100
Reviewed-by: De Chivre, RenaudX <renaudx.de.chivre@intel.com>
Tested-by: Barthes, FabienX <fabienx.barthes@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>
Diffstat (limited to 'parameter/DomainConfiguration.cpp')
-rw-r--r-- | parameter/DomainConfiguration.cpp | 75 |
1 files changed, 69 insertions, 6 deletions
diff --git a/parameter/DomainConfiguration.cpp b/parameter/DomainConfiguration.cpp index b30c8e3..f746be9 100644 --- a/parameter/DomainConfiguration.cpp +++ b/parameter/DomainConfiguration.cpp @@ -36,6 +36,7 @@ #include "XmlDomainSerializingContext.h" #include "ConfigurationAccessContext.h" #include <assert.h> +#include "RuleParser.h" #define base CBinarySerializableElement @@ -282,6 +283,47 @@ void CDomainConfiguration::getElementSequence(string& strResult) const } } +// Application rule +bool CDomainConfiguration::setApplicationRule(const string& strApplicationRule, const CSelectionCriteriaDefinition* pSelectionCriteriaDefinition, string& strError) +{ + // Parser + CRuleParser ruleParser(strApplicationRule, pSelectionCriteriaDefinition); + + // Attempt to parse it + if (!ruleParser.parse(NULL, strError)) { + + return false; + } + // Replace compound rule + setRule(ruleParser.grabRootRule()); + + return true; +} + +void CDomainConfiguration::clearApplicationRule() +{ + // Replace compound rule + setRule(NULL); +} + +void CDomainConfiguration::getApplicationRule(string& strResult) const +{ + // Rule + const CCompoundRule* pRule = getRule(); + + if (pRule) { + // Start clear + strResult.clear(); + + // Dump rule + pRule->dump(strResult); + + } else { + + strResult = "<none>"; + } +} + // Save data from current void CDomainConfiguration::save(const CParameterBlackboard* pMainBlackboard) { @@ -518,12 +560,6 @@ CAreaConfiguration* CDomainConfiguration::getAreaConfiguration(uint32_t uiAreaCo return NULL; } -// Presence of application condition -bool CDomainConfiguration::hasRule() const -{ - return !!getRule(); -} - // Rule const CCompoundRule* CDomainConfiguration::getRule() const { @@ -534,6 +570,33 @@ const CCompoundRule* CDomainConfiguration::getRule() const return NULL; } +CCompoundRule* CDomainConfiguration::getRule() +{ + if (getNbChildren()) { + // Rule created + return static_cast<CCompoundRule*>(getChild(ECompoundRule)); + } + return NULL; +} + +void CDomainConfiguration::setRule(CCompoundRule* pRule) +{ + CCompoundRule* pOldRule = getRule(); + + if (pOldRule) { + // Remove previous rule + removeChild(pOldRule); + + delete pOldRule; + } + + // Set new one + if (pRule) { + // Chain + addChild(pRule); + } +} + // Serialization void CDomainConfiguration::binarySerialize(CBinaryStream& binaryStream) { |