summaryrefslogtreecommitdiffstats
path: root/parameter/XmlFileIncluderElement.cpp
diff options
context:
space:
mode:
authorMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-04-08 14:10:03 +0200
committerMattijs Korpershoek <mattijsx.korpershoek@intel.com>2014-06-25 10:52:21 +0200
commitcce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9 (patch)
tree8f797fac149da0d4e54c2e40b224a76cb9242c47 /parameter/XmlFileIncluderElement.cpp
parent3141891778a0564887d25b8b06b898daf3c1c9b5 (diff)
downloadexternal_parameter-framework-cce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9.zip
external_parameter-framework-cce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9.tar.gz
external_parameter-framework-cce85f6b6691e4b1ddb81171e3ca5b5aeb71e6b9.tar.bz2
Test-platform enable/disable xml validation
BZ: 184054 test-platform has no way to tell to the parameter framework that it wants the parameter framework to validate xmls on loading. New command added to test-platform executable. setValidateSchemasOnStart true|false If set to true, the parameter framework will try to validate the .xmls with the .xsds located next to them. If set to false, it will never attempt to validate. SetValidateSchemas is false by default to allow backward compatibility. Note(a): This assumes that the script is able to find the .xsd files (which should be in /tmp/Schemas/). Change-Id: I7a5b0bc09d31e6647d8c631380d31503666e7e7b Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>
Diffstat (limited to 'parameter/XmlFileIncluderElement.cpp')
-rw-r--r--parameter/XmlFileIncluderElement.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/parameter/XmlFileIncluderElement.cpp b/parameter/XmlFileIncluderElement.cpp
index 8543744..2e97bdb 100644
--- a/parameter/XmlFileIncluderElement.cpp
+++ b/parameter/XmlFileIncluderElement.cpp
@@ -36,9 +36,12 @@
#include <assert.h>
#define base CKindElement
-
-CXmlFileIncluderElement::CXmlFileIncluderElement(const string& strName, const string& strKind) : base(strName, strKind)
+CXmlFileIncluderElement::CXmlFileIncluderElement(const string& strName,
+ const string& strKind,
+ bool bValidateWithSchemas) : base(strName,
+ strKind)
{
+ _bValidateSchemasOnStart = bValidateWithSchemas;
}
// From IXmlSink
@@ -58,13 +61,18 @@ bool CXmlFileIncluderElement::fromXml(const CXmlElement& xmlElement, CXmlSeriali
// Instantiate parser
string strIncludedElementType = getIncludedElementType();
-
{
// Open a log section titled with loading file path
CAutoLog autolog(this, "Loading " + strPath);
// Use a doc source that load data from a file
- CXmlFileDocSource fileDocSource(strPath, elementSerializingContext.getXmlSchemaPathFolder() + "/" + strIncludedElementType + ".xsd", strIncludedElementType);
+ string strPathToXsdFile = elementSerializingContext.getXmlSchemaPathFolder() + "/" +
+ strIncludedElementType + ".xsd";
+
+ CXmlFileDocSource fileDocSource(strPath,
+ strPathToXsdFile,
+ strIncludedElementType,
+ _bValidateSchemasOnStart);
if (!fileDocSource.isParsable(elementSerializingContext)) {