FCL/sf/mw/appinstall: comparison secureswitools/swisistools/source/interpretsislib/expressionevaluator.cpp

equal deleted inserted replaced

-:98a43fae6e2b
+:741e5bba2bd1
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 		throw std::runtime_error("null pointer");
 	}
 }
-ExpressionResult ExpressionEvaluator::Evaluate(const CSISExpression* aExpression)
+ExpressionResult ExpressionEvaluator::Evaluate(const CSISExpression* aExpression, bool aLogInfo )
 {
 	Require(aExpression);
-	return Evaluate(*aExpression);
+	return Evaluate(*aExpression, aLogInfo);
 }
-ExpressionResult ExpressionEvaluator::Evaluate(const CSISExpression& aExpression)
+ExpressionResult ExpressionEvaluator::Evaluate(const CSISExpression& aExpression, bool aLogInfo)
 {
 	if (++iExpressionDepth > KMaxExpressionDepth)
 	    {
 		iExpressionDepth=0;
 		std::string error = "SIS File expression too complex\n";
 	case CSISExpression::EBinOpGreaterThan:
 	case CSISExpression::EBinOpLessThan:
 	case CSISExpression::EBinOpGreaterThanOrEqual:
 	case CSISExpression::EBinOpLessThanOrEqual:
 {
-		const ExpressionResult resultLeft = Evaluate( aExpression.LHS() );
+		const ExpressionResult resultLeft = Evaluate( aExpression.LHS(), aLogInfo );
-		const ExpressionResult resultRight = Evaluate( aExpression.RHS() );
+		const ExpressionResult resultRight = Evaluate( aExpression.RHS(), aLogInfo  );
 //
 	    switch (aExpression.Operator())
 	        {
 	    case CSISExpression::EBinOpEqual:
 iTempResult = ( resultLeft == resultRight );
 		break;
 }
 case CSISExpression::ELogOpAnd:
 		{
-		ExpressionResult tmp1 = Evaluate(aExpression.LHS());
+		ExpressionResult tmp1 = Evaluate(aExpression.LHS(), aLogInfo );
-		ExpressionResult tmp2 = Evaluate(aExpression.RHS());
+		ExpressionResult tmp2 = Evaluate(aExpression.RHS(), aLogInfo );
 		iTempResult = ExpressionResult(tmp1.BoolValue() && tmp2.BoolValue());
 		break;
 		}
 	case CSISExpression::ELogOpOr:
 		{
-		ExpressionResult tmp1 = Evaluate(aExpression.LHS());
+		ExpressionResult tmp1 = Evaluate(aExpression.LHS(), aLogInfo );
 		if (tmp1.BoolValue())
 		{
 			iTempResult = ExpressionResult(true);
 	    	}
 		else
 		    {
-			iTempResult = ExpressionResult(Evaluate(aExpression.RHS())).BoolValue();
+			iTempResult = ExpressionResult(Evaluate(aExpression.RHS(), aLogInfo)).BoolValue();
 		    }
 		break;
 		}
 	case CSISExpression::EUnaryOpNot:
-		iTempResult=!Evaluate(aExpression.RHS());
+		iTempResult=!Evaluate(aExpression.RHS(), aLogInfo );
 		break;
 	case CSISExpression::EFuncAppProperties:
 {
-const TUint32 resultLeft = Evaluate( aExpression.LHS() ).IntegerValue();
+const TUint32 resultLeft = Evaluate( aExpression.LHS(), aLogInfo  ).IntegerValue();
-const TUint32 resultRight = Evaluate( aExpression.RHS() ).IntegerValue();
+const TUint32 resultRight = Evaluate( aExpression.RHS(), aLogInfo  ).IntegerValue();
 //
 		iTempResult = iExpEnv.ApplicationProperty( resultLeft, resultRight );
 		break;
 }
 	case CSISExpression::EFuncDevProperties:
-		iTempResult = ExpressionResult(iExpEnv.Package(Evaluate(aExpression.RHS()).IntegerValue()));
+		iTempResult = ExpressionResult(iExpEnv.Package(Evaluate(aExpression.RHS(), aLogInfo ).IntegerValue()));
 		break;
 	case CSISExpression::EFuncExists:
 		{
 		const CSISString& pS = aExpression.String();
 			{
 			iTempResult = ExpressionResult(iExpEnv.DeviceLanguage(pS.GetString().substr(KFuncSupportedLanguagePrefix.length())));
 			}
 		else
 			{
-			iTempResult = ExpressionResult(iExpEnv.FindFile(pS.GetString()));
+			iTempResult = ExpressionResult(iExpEnv.FindFile(pS.GetString(), aLogInfo));
 			}
 		}
 		break;
 	case CSISExpression::EPrimTypeString:
 		break;
 	case CSISExpression::EPrimTypeVariable:
 		{
 const int variableId = aExpression.IntValue();
-const int variableValue = iExpEnv.Variable( variableId );
+const int variableValue = iExpEnv.Variable( variableId, aLogInfo);
 //
 		iTempResult = ExpressionResult( variableValue );
 		break;
 		}
 {
 	return iSisFile.GetPackageName();
 }
-bool ExpressionEnvironment::FindFile( const std::wstring& aFileName )
+bool ExpressionEnvironment::FindFile( const std::wstring& aFileName, bool aLogInfo )
 {
 bool fileExists = false;
 // Fixed up file name
 std::wstring fileName( aFileName );
 // Filename length must be at least 3 characters, i.e. drive + semicolon + backslash + filename
 //
 if ( fileName.length() >= 1 && fileName[ 0 ] == L'\\' )
 {
 // Bad file name?
-		LWARN(L"\tAssuming file path \'" << aFileName << L"\' refers to Z:" );
+		if( aLogInfo )
+			{
+			LWARN(L"\tAssuming file path \'" << aFileName << L"\' refers to Z:" );
+			}
 fileName = L"Z:" + fileName;
 }
 // Require for invalid file exception (also helps with debugging)
 std::string narrowFileName;
 {
 		std::string error = "corrupt SIS file: bad \'EXISTS' filename: \'" + narrowFileName + "\'";
 		throw InvalidSis( "", error, INVALID_SIS );
 }
 //
-std::ostringstream stream;
+	if(aLogInfo)
-stream << "\tIF EXISTS(\'" << narrowFileName << "\') => " << fileExists;
+		{
-std::string msg = stream.str();
+		std::ostringstream stream;
-std::wstring finalMessage = Utf8ToUcs2( msg );
+		stream << "\tIF EXISTS(\'" << narrowFileName << "\') => " << fileExists;
-LINFO( finalMessage );
+		std::string msg = stream.str();
+		std::wstring finalMessage = Utf8ToUcs2( msg );
+		LINFO( finalMessage );
+		}
 //
 return fileExists;
 }
 	// No property
 	return 0;
 }
-int ExpressionEnvironment::Variable( int aVariableId )
+int ExpressionEnvironment::Variable( int aVariableId, bool aLogInfo )
 {
 int result = 0;
 // For debugging
 std::string attributeName = ConfigManager::AttributeNameById( aVariableId );
 		if (aVariableId == KVariableLanguage)
 			{
 			if (!iSisFile.IsSupportedLanguage((TUint32)result))
 				{
 				int firstLanguage = iSisFile.GetLanguage(); // get the first language
-				std::ostringstream stream;
+				if(aLogInfo)
-				stream << "Input language " << result << " is not supported by SIS file. Using first language " <<firstLanguage;
+					{
-				std::string msg = stream.str();
+					std::ostringstream stream;
-				std::wstring finalMessage = Utf8ToUcs2( msg );
+					stream << "Input language " << result << " is not supported by SIS file. Using first language " <<firstLanguage;
-				LWARN( finalMessage );
+					std::string msg = stream.str();
+					std::wstring finalMessage = Utf8ToUcs2( msg );
+					LWARN( finalMessage );
+					}
 				result = firstLanguage;
 				}
 			}
-std::ostringstream stream;
+if(aLogInfo)
-stream << "\tIF " << attributeName << " ... where [" << attributeName << " = " << result << "]";
+			{
-std::string msg = stream.str();
+			std::ostringstream stream;
-std::wstring finalMessage = Utf8ToUcs2( msg );
+			stream << "\tIF " << attributeName << " ... where [" << attributeName << " = " << result << "]";
-LINFO( finalMessage );
+			std::string msg = stream.str();
+			std::wstring finalMessage = Utf8ToUcs2( msg );
+			LINFO( finalMessage );
+			}
 }
 	else if ( aVariableId == KVariableLanguage )
 	{
-		LWARN(L"Disregarding language selection. Using ELangEnglish");
+		if(aLogInfo)
+			{
+			LWARN(L"Disregarding language selection. Using ELangEnglish");
+			}
 		result = 1;
 	}
 else
 {
 std::string packageName;

branch	RCL_3
changeset 34	741e5bba2bd1
parent 0	ba25891c3a9e
child 50	c6e8afe0ba85
child 62	5cc91383ab1e