Merge remote-tracking branch 'upstream/pull/104'2.2.0_weston_5_compartible

* upstream/pull/104
  LayerManagerControl: Prevent conversion of filenames into lowercase

  Reviewed-by: Emre Ucan <eucan@de.adit-jv.com>
  Tested-by: Emre Ucan <eucan@de.adit-jv.com>

2 files changed, 6 insertions, 1 deletions

diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/Expression.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/Expression.cpp
index a08dc8f..af61cd4 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/Expression.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/Expression.cpp
@@ -213,6 +213,12 @@ ExpressionList Expression::getNextExpressionClosure(string text)
         {
             Expression* expr = *iter;
 
+            if((expr->mName).compare("<file>") &&
+               (expr->mName).compare("<filename>"))
+            {
+                transform(text.begin(), text.end(), text.begin(), ::tolower);
+            }
+
             if (expr->isVar())
             {
                 nextClosure.push_back(expr);
diff --git a/ivi-layermanagement-examples/LayerManagerControl/src/ExpressionInterpreter.cpp b/ivi-layermanagement-examples/LayerManagerControl/src/ExpressionInterpreter.cpp
index 336507e..d043dcd 100644
--- a/ivi-layermanagement-examples/LayerManagerControl/src/ExpressionInterpreter.cpp
+++ b/ivi-layermanagement-examples/LayerManagerControl/src/ExpressionInterpreter.cpp
@@ -83,7 +83,6 @@ CommandResult ExpressionInterpreter::interpretCommand(string userInput)
     while (result == CommandSuccess && !ss.eof())
     {
         ss >> text;
-        transform(text.begin(), text.end(), text.begin(), ::tolower);
 
         ExpressionList::const_iterator iter = currentState.begin();
         ExpressionList::const_iterator end = currentState.end();