mmapitest/devsoundexthaitest/common/src/DataWrapperBase.cpp
author hgs
Wed, 08 Sep 2010 17:15:23 +0100
changeset 56 b6488ac24ddc
parent 26 c36d67f77f75
permissions -rw-r--r--
2010wk34_02
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
26
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     1
/*
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     2
* Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     3
* All rights reserved.
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     4
* This component and the accompanying materials are made available
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     5
* under the terms of "Eclipse Public License v1.0"
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     6
* which accompanies this distribution, and is available
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     7
* at the URL "http://www.eclipse.org/legal/epl-v10.html".
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     8
*
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
     9
* Initial Contributors:
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    10
* Nokia Corporation - initial contribution.
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    11
*
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    12
* Contributors:
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    13
*
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    14
* Description: 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    15
*
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    16
*/
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    17
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    18
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    19
#include "datawrapperbase.h"
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    20
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    21
/*@{*/
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    22
///	Constant Literals used.
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    23
_LIT(KPrefixHex,			"0x");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    24
_LIT(KPrefixOctal,			"0");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    25
_LIT(KSuffixBinary,			"b");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    26
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    27
_LIT(KIncludeSection,		"include");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    28
_LIT(KFile,					"file%d");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    29
_LIT(KMatch,				"*{*,*}*");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    30
_LIT(KStart,				"{");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    31
_LIT(KSeparator,			",");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    32
_LIT(KEnd,					"}");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    33
_LIT(KDataRead,				"INI READ : %S %S %S");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    34
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    35
/*@}*/
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    36
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    37
CDataWrapperBase::CDataWrapperBase()
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    38
:	CDataWrapper()
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    39
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    40
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    41
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    42
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    43
 * Public destructor
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    44
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    45
CDataWrapperBase::~CDataWrapperBase()
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    46
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    47
	iInclude.ResetAndDestroy();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    48
	iBuffer.ResetAndDestroy();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    49
	iFs.Close();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    50
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    51
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    52
void CDataWrapperBase::InitialiseL()
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    53
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    54
	iTimer.CreateLocal();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    55
	CDataWrapper::InitialiseL();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    56
	TBuf<KMaxTestExecuteCommandLength>	tempStore;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    57
	TPtrC		fileName;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    58
	TBool		moreData=ETrue;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    59
	TBool		index=0;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    60
	while ( moreData )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    61
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    62
		tempStore.Format(KFile(), ++index);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    63
		moreData=GetStringFromConfig(KIncludeSection, tempStore, fileName);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    64
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    65
		if (moreData)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    66
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    67
			CIniData*	iniData=CIniData::NewL(fileName);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    68
			CleanupStack::PushL(iniData);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    69
			iInclude.Append(iniData);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    70
			CleanupStack::Pop(iniData);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    71
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    72
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    73
	User::LeaveIfError(iFs.Connect());
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    74
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    75
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    76
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    77
 * Reads the value present from the test steps ini file within the mentioned section name and key name
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    78
 * Copies the value to the TBool reference passed in possible values TRUE, FALSE
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    79
 * @param aSectName - Section within the test steps ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    80
 * @param aKeyName - Name of a key within a section
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    81
 * @return aResult - The value of the boolean
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    82
 * @return TBool - ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    83
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    84
TBool CDataWrapperBase::GetBoolFromConfig(const TDesC& aSectName,const TDesC& aKeyName,TBool& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    85
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    86
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    87
	TPtrC	result;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    88
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    89
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    90
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    91
		ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    92
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    93
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    94
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    95
		_LIT(KTrue,"true");
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    96
		aResult=(result.FindF(KTrue) != KErrNotFound);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    97
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    98
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
    99
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   100
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   101
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   102
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   103
 * Reads the value present from the test steps ini file within the mentioned section name and key name
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   104
 * Copies the value to the TInt reference passed in
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   105
 * @param aSectName - Section within the test steps ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   106
 * @param aKeyName - Name of a key within a section
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   107
 * @return aResult - The value of the integer
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   108
 * @return TBool - ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   109
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   110
TBool CDataWrapperBase::GetIntFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   111
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   112
	TPtrC	result;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   113
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   114
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   115
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   116
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   117
		ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   118
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   119
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   120
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   121
		TLex	lex(result);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   122
		ret=(lex.Val(aResult)==KErrNone);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   123
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   124
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   125
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   126
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   127
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   128
 * Reads the value present from the test steps ini file within the mentioned section name and key name
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   129
 * Copies the value to the TReal reference passed in
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   130
 * @param aSectName - Section within the test steps ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   131
 * @param aKeyName - Name of a key within a section
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   132
 * @return aResult - The value of the real
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   133
 * @return TBool - ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   134
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   135
TBool CDataWrapperBase::GetRealFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TReal& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   136
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   137
	TPtrC result;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   138
	TBool ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   139
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   140
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   141
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   142
		ret = EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   143
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   144
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   145
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   146
		TLex lex(result);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   147
		ret = ( lex.Val(aResult)==KErrNone );
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   148
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   149
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   150
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   151
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   152
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   153
 * Reads the value present from the test steps ini file within the mentioned section name and key name
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   154
 * Copies the value to the TPtrC reference passed in
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   155
 * @param aSectName - Section within the test steps ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   156
 * @param aKeyName - Name of a key within a section
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   157
 * @return aResult - Reference to the string on the heap
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   158
 * @return TBool - ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   159
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   160
TBool CDataWrapperBase::GetStringFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   161
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   162
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   163
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, aResult));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   164
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   165
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   166
		ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   167
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   168
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   169
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   170
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   171
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   172
 * Reads the value present from the test steps ini file within the mentioned section name and key name
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   173
 * Copies the value to the TInt reference passed in. The value can optionally be prefixed with 0x
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   174
 * @param aSectName - Section within the test steps ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   175
 * @param aKeyName - Name of a key within a section
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   176
 * @return aResult - The integer value of the Hex input
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   177
 * @return TBool - ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   178
 */	
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   179
TBool CDataWrapperBase::GetHexFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TInt& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   180
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   181
	TPtrC	result;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   182
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   183
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   184
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   185
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   186
		ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   187
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   188
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   189
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   190
		TLex	lex;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   191
		if( result.FindC(KPrefixHex)==KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   192
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   193
			lex=result.Mid(KPrefixHex().Length());
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   194
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   195
		else
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   196
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   197
			lex=result;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   198
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   199
		ret=(lex.Val((TUint &)aResult, EHex)==KErrNone);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   200
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   201
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   202
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   203
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   204
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   205
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   206
 * Reads the value present from the test steps ini file within the mentioned section name and key name
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   207
 * Copies the value to the TUint reference passed in.
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   208
 * If the value is prefixed with 0x the value is read as a hexidecimal value
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   209
 * If the value is suffixed with b the value is read as a binary value
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   210
 * If the value is prefixed with a 0 the value is read as an octal value
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   211
 * If it does not match the above it is read in as an integer
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   212
 * @param aSectName - Section within the test steps ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   213
 * @param aKeyName - Name of a key within a section
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   214
 * @return aResult - The integer value of the Hex input
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   215
 * @return TBool - ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   216
 */	
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   217
TBool CDataWrapperBase::GetUintFromConfig(const TDesC& aSectName, const TDesC& aKeyName, TUint& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   218
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   219
	TPtrC	result;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   220
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   221
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, result));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   222
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   223
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   224
		ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   225
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   226
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   227
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   228
		TLex	lex(result);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   229
		if( result.FindC(KPrefixHex)==KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   230
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   231
			lex=result.Mid(KPrefixHex().Length());
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   232
			ret=(lex.Val(aResult, EHex)==KErrNone);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   233
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   234
		else
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   235
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   236
			TInt	binarySuffixPosition=result.Length()-KSuffixBinary().Length();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   237
			if ( result.FindC(KSuffixBinary)==binarySuffixPosition )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   238
				{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   239
				lex=result.Left(binarySuffixPosition);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   240
				ret=(lex.Val(aResult, EBinary)==KErrNone);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   241
				}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   242
			else
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   243
				{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   244
				if( result.FindC(KPrefixOctal)==KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   245
					{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   246
					ret=(lex.Val(aResult, EOctal)==KErrNone);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   247
					}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   248
				else
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   249
					{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   250
					TInt	intResult;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   251
					ret=(lex.Val(intResult)==KErrNone);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   252
					if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   253
						{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   254
						aResult=(TUint)intResult;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   255
						}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   256
					}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   257
				}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   258
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   259
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   260
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   261
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   262
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   263
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   264
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   265
 *   Return array of string parameters i.e. key=a1,a2,a3 returns array which contains
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   266
 *   String a1, a2 and a3.
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   267
 *   @return ret - EFalse if can't get a String parameter from Config file.  ETrue if KErrNone
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   268
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   269
TBool CDataWrapperBase::GetArrayRectFromConfig(const TDesC& aSectName, const TDesC& aKeyName, RPointerArray<HBufC>& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   270
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   271
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   272
	TPtrC completeArray;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   273
	
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   274
	TRAPD(err, ret=GetCommandStringParameterL(aSectName, aKeyName, completeArray));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   275
	if ( err != KErrNone )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   276
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   277
		ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   278
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   279
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   280
    TLex16 lex(completeArray); // Here we have the array as a string i.e. "a1,a2,a3"
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   281
    TBuf<256> buf;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   282
    TChar chr;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   283
    
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   284
    while(!lex.Eos())
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   285
        {
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   286
        chr = lex.Get();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   287
        // Check if there was a list separator
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   288
        if ((chr == ',') && (lex.Peek() == '('))
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   289
            {
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   290
            HBufC* param = buf.AllocLC();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   291
            buf.Zero();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   292
            aResult.Append(param);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   293
            CleanupStack::Pop(param); // pointer to buf is stored in RPointerArray
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   294
            }
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   295
        // If not separator character we can store the character into array
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   296
        else
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   297
            {
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   298
            buf.Append(chr);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   299
            }
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   300
        }
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   301
    // Remember to put last token into array (,a3)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   302
    HBufC* param = buf.AllocLC();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   303
    aResult.Append(param);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   304
    CleanupStack::Pop(param);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   305
    
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   306
    return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   307
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   308
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   309
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   310
 * Reads the parameter	asociated to the specified command
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   311
 * @param aSectName	Section on ini file
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   312
 * @param aKeyName		Name of the parameter
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   313
 * @param aResult			descriptor containing parameter
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   314
 * @return TBool  ETrue for found, EFalse for not found 
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   315
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   316
TBool CDataWrapperBase::GetCommandStringParameterL(const TDesC& aSectName, const TDesC& aKeyName, TPtrC& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   317
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   318
	TBool	ret=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   319
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   320
	if ( aSectName.Length()!=0 )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   321
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   322
		ret=CDataWrapper::GetStringFromConfig(aSectName, aKeyName, aResult);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   323
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   324
		for ( TInt index=iInclude.Count(); (index>0) && (!ret); )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   325
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   326
			ret=iInclude[--index]->FindVar(aSectName, aKeyName, aResult);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   327
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   328
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   329
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   330
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   331
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   332
		if ( aResult.Match(KMatch)!=KErrNotFound )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   333
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   334
			//	We have an entry of the format
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   335
			//	entry =*{section,entry}*
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   336
			//	where * is one or more characters
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   337
			//	We need to construct this from other data in the ini file replacing {*,*}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   338
			//	with the data from
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   339
			//	[section]
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   340
			//	entry =some_value
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   341
			HBufC*	buffer=HBufC::NewLC(aResult.Length());
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   342
			buffer->Des().Copy(aResult);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   343
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   344
			TInt	startLength=KStart().Length();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   345
			TInt	sparatorLength=KSeparator().Length();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   346
			TInt	endLength=KEnd().Length();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   347
			TInt	bufferLength;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   348
			TInt	start;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   349
			TInt	sparator;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   350
			TInt	end;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   351
			TPtrC	remaining;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   352
			TLex	lex;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   353
			do
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   354
				{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   355
				bufferLength=buffer->Length();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   356
				start=buffer->Find(KStart);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   357
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   358
				remaining.Set(buffer->Des().Right(bufferLength-start-startLength));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   359
				sparator=remaining.Find(KSeparator);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   360
				remaining.Set(remaining.Right(remaining.Length()-sparator-sparatorLength));
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   361
				sparator += (start + startLength);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   362
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   363
				end=remaining.Find(KEnd) + sparator + sparatorLength;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   364
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   365
				TPtrC	sectionName(buffer->Ptr()+start+startLength, sparator-start-startLength);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   366
				TPtrC	keyName(buffer->Ptr()+sparator+sparatorLength, end-sparator-sparatorLength);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   367
				sectionName.Set(TLex(sectionName).NextToken());
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   368
				keyName.Set(TLex(keyName).NextToken());
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   369
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   370
				TInt	entrySize=0;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   371
				TPtrC	entryData;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   372
				TBool	found=CDataWrapper::GetStringFromConfig(sectionName, keyName, entryData);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   373
				for ( TInt index=iInclude.Count(); (index>0) && (!found);  )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   374
					{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   375
					found=iInclude[--index]->FindVar(sectionName, keyName, entryData);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   376
					}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   377
				if ( found )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   378
					{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   379
					entrySize=entryData.Length();
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   380
					}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   381
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   382
				TInt	newLength=start + bufferLength - end - endLength + entrySize;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   383
				HBufC*	bufferNew=HBufC::NewLC(newLength);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   384
				bufferNew->Des().Copy(buffer->Ptr(), start);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   385
				if ( entrySize>0 )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   386
					{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   387
					bufferNew->Des().Append(entryData);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   388
					}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   389
				bufferNew->Des().Append(buffer->Ptr() + end + endLength, bufferLength - end - endLength);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   390
				CleanupStack::Pop(bufferNew);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   391
				CleanupStack::PopAndDestroy(buffer);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   392
				buffer=bufferNew;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   393
				CleanupStack::PushL(buffer);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   394
				}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   395
			while ( buffer->Match(KMatch)!=KErrNotFound );
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   396
			iBuffer.Append(buffer);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   397
			CleanupStack::Pop(buffer);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   398
			aResult.Set(*buffer);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   399
			INFO_PRINTF4(KDataRead, &aSectName, &aKeyName , &aResult);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   400
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   401
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   402
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   403
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   404
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   405
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   406
/**
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   407
 * Utility function to produce time delay
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   408
 * @param aTimeoutInSecs Times in micro seconds
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   409
 */
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   410
void CDataWrapperBase::Timedelay(TInt aTimeoutInSecs)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   411
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   412
	TRequestStatus	status;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   413
	iTimer.After(status, aTimeoutInSecs);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   414
	User::WaitForRequest(status);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   415
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   416
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   417
TBool CDataWrapperBase::GetEnumFromConfig(const TDesC& aSectName, const TDesC& aKeyName, const TEnumEntryTable* aTable, TInt& aResult)
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   418
	{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   419
	TPtrC	str;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   420
	TBool	ret=GetStringFromConfig(aSectName, aKeyName, str);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   421
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   422
	if ( ret )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   423
		{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   424
		TBool	found=EFalse;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   425
		TInt	index=0;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   426
		while ( (aTable[index].iValue!=-1) && !found )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   427
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   428
			if ( aTable[index].iString==str )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   429
				{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   430
				found=ETrue;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   431
				aResult=aTable[index].iValue;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   432
				}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   433
			else
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   434
				{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   435
				++index;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   436
				}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   437
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   438
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   439
		if ( !found )
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   440
			{
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   441
			ret=GetIntFromConfig(aSectName, aKeyName, aResult);
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   442
			}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   443
		}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   444
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   445
	return ret;
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   446
	}
c36d67f77f75 2010wk21_04
hgs
parents:
diff changeset
   447