--- a/phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Build information file for contact model plugin needed for chinese find
-*
-*/
-
-
-#include "cntfindpluginuid.h"
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET cntfindplugin.dll
-TARGETTYPE PLUGIN
-UID KEComPluginUID2 KCntModelFindPluginDllUID3
-CAPABILITY CAP_ECOM_PLUGIN
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-SOURCE dllmain.cpp
-SOURCE cntfindplugin.cpp
-
-USERINCLUDE ../group
-APP_LAYER_SYSTEMINCLUDE
-// Symbian uses #include <ecom.h> in cntviewfindconfig.h
-SYSTEMINCLUDE /epoc32/include/ecom
-
-START RESOURCE 101f85f4.rss
-TARGET cntfindplugin
-TARGETPATH resource/plugins
-END
-
-LIBRARY euser.lib
-LIBRARY ECom.lib
-LIBRARY findutil.lib
--- a/phonebookengines/CntFindPlugin/group/CntFindPluginUid.h Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Common header for Contact Model Find Plugin UIDs.
-*
-*
-*/
-
-#ifndef __CntFindPluginUid_H__
-#define __CntFindPluginUid_H__
-
-// Contact Model Find Plugin DLL UID
-#define KCntModelFindPluginDllUID3 0x101F85F4
-
-// Contact Model Find Plugin Interface UID
-#define KCntModelFindPluginInterfaceUID 0x101F85F5
-
-// Implementation UID
-#define KCntModelFindPluginImplementationUID 0x101F85F6
-
-//
-// Common system UIDs
-//
-
-// ECom Plugin UID 2
-#define KEComPluginUID2 0x10009D8D
-
-#endif // CntFindPluginUid
-
--- a/phonebookengines/CntFindPlugin/rom/CntFindPlugin.iby Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __CNTFINDPLUGIN_IBY__
-#define __CNTFINDPLUGIN_IBY__
-
-ECOM_PLUGIN(cntfindplugin.dll,101f85f4.RSC)
-
-#endif
--- a/phonebookengines/CntFindPlugin/src/101f85f4.rss Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Contact model ECOM plugin resource file
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-#include "cntfindpluginuid.h"
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = KCntModelFindPluginDllUID3;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KCntModelFindPluginInterfaceUID;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KCntModelFindPluginImplementationUID;
- version_no = 1;
- display_name = "Contacts Find Plugin";
- default_data = "<none>";
- opaque_data = "";
- }
- };
- }
- };
- }
--- a/phonebookengines/CntFindPlugin/src/CntFindPlugin.cpp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Contact model ECOM plugin for chinese find.
-*
-*/
-
-
-// INCLUDE FILES
-#include "cntfindplugin.h"
-#include <FindUtil.h>
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::NewL
-// ---------------------------------------------------------------------------
-//
-CAknFindUtilBase* CAknFindUtilBase::NewL()
- {
- CAknFindUtilBase* self=new(ELeave) CAknFindUtilBase;
- CleanupStack::PushL( self );
- self->OpenL();
- CleanupStack::Pop();
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::~CAknFindUtilBase
-// ---------------------------------------------------------------------------
-//
-CAknFindUtilBase::~CAknFindUtilBase()
- {
- delete iFindUtil;
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::CAknFindUtilBase
-// ---------------------------------------------------------------------------
-//
-CAknFindUtilBase::CAknFindUtilBase()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::OpenL
-// ---------------------------------------------------------------------------
-//
-void CAknFindUtilBase::OpenL()
- {
- if (!iFindUtil)
- {
- iFindUtil = CFindUtil::NewL();
- }
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::Close
-// ---------------------------------------------------------------------------
-//
-void CAknFindUtilBase::Close()
- {
- delete iFindUtil;
- iFindUtil = NULL;
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::Match
-// ---------------------------------------------------------------------------
-//
-TBool CAknFindUtilBase::Match(const TDesC& aContactsField, const TDesC& aWord)
- {
- return iFindUtil->Interface()->Match(aContactsField, aWord);
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::IsWordValidForMatching
-// ---------------------------------------------------------------------------
-//
-TBool CAknFindUtilBase::IsWordValidForMatching(const TDesC& aWord)
- {
- return iFindUtil->Interface()->IsWordValidForMatching(aWord);
- }
-
-// ---------------------------------------------------------------------------
-// CAknFindUtilBase::MatchRefineL
-// ---------------------------------------------------------------------------
-//
-TBool CAknFindUtilBase::MatchRefineL
- (const TDesC& aItemString, const TDesC &aSearchText)
- {
- return iFindUtil->Interface()->MatchRefineL(aItemString, aSearchText);
- }
-
-// End of File
--- a/phonebookengines/CntFindPlugin/src/CntFindPlugin.h Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Contact model ECOM plugin for chinese find.
-*
-*/
-
-
-#ifndef __CntFindPlugin_H__
-#define __CntFindPlugin_H__
-
-// INCLUDES
-#include <cntviewfindconfig.h>
-
-// FORWARD DECLARATIONS
-class CFindUtil;
-
-// CLASS DECLARATION
-
-/**
- * This class implements the functionality promised by
- * the CFindUtilInterface definition class.
- */
-class CAknFindUtilBase : public CContactViewFindConfigInterface
- {
- public: // Construction / Destruction
- /**
- * Two phase static constructor.
- * @return Newly created instance of CAknFindUtilBase.
- */
- static CAknFindUtilBase* NewL();
- ~CAknFindUtilBase();
-
- private: // From CContactViewFindConfigInterface
- void OpenL();
- void Close();
- TBool Match(const TDesC& aContactsField, const TDesC& aWord);
- TBool IsWordValidForMatching(const TDesC& aWord);
- TBool MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText);
-
- private: // Implementation
- /**
- * Standard C++ constructor.
- */
- CAknFindUtilBase();
-
- private: // Data
- /// Own: Find utility that implements the actual finding functionality
- CFindUtil* iFindUtil;
- };
-
-#endif // __CAknFindUtilBase_H__
-
-// End of File
--- a/phonebookengines/CntFindPlugin/src/DllMain.cpp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-// INCLUDES
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-#include "cntfindplugin.h"
-#include "cntfindpluginuid.h"
-
-// Define the interface UIDs
-const TImplementationProxy ImplementationTable[] =
- {
- IMPLEMENTATION_PROXY_ENTRY(KCntModelFindPluginImplementationUID,
- CAknFindUtilBase::NewL)
- };
-
-// The one and only exported function that is the ECom entry point
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy
- (TInt& aTableCount)
- {
- aTableCount =
- sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
- return ImplementationTable;
- }
-
-/**
- * Standard Symbian OS DLL entry point.
- */
-#ifndef EKA2
-TBool E32Dll(TDllReason)
- {
- return ETrue;
- }
-#endif // EKA2
-
-// End of File
--- a/phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Build information file for contact model plugin needed for japanese sort
-*
-*/
-
-
-#include "cntsortpluginuid.h"
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET cntsortplugin.dll
-TARGETTYPE PLUGIN
-UID KEComPluginUID2 KCntModelSortPluginDllUID3
-CAPABILITY CAP_ECOM_PLUGIN
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-SOURCE dllmain.cpp
-SOURCE ccntsortplugin.cpp
-SOURCE csortkeyarray.cpp
-
-USERINCLUDE ../group
-APP_LAYER_SYSTEMINCLUDE
-// Symbian uses #include <ecom.h> in cntviewsortplugin.h
-SYSTEMINCLUDE /epoc32/include/ecom
-
-START RESOURCE 101f85a9.rss
-TARGET cntsortplugin
-TARGETPATH resource/plugins
-END
-
-LIBRARY euser.lib
-LIBRARY ECom.lib
-LIBRARY cntmodel.lib
-LIBRARY sortutil.lib
--- a/phonebookengines/CntSortPlugin/group/CntSortPluginUid.h Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Common header for Contact Model Sort Plugin UIDs.
-*
-*
-*/
-
-#ifndef __CntSortPluginUid_H__
-#define __CntSortPluginUid_H__
-
-// Contact Model Sort Plugin DLL UID
-#define KCntModelSortPluginDllUID3 0x101F85A9
-
-// Contact Model Sort Plugin Interface UID
-#define KCntModelSortPluginInterfaceUID 0x10200FBD
-
-// Implementation UID
-#define KCntModelSortPluginImplementationUID 0x101F85AA
-
-//
-// Common system UIDs
-//
-
-// ECom Plugin UID 2
-#define KEComPluginUID2 0x10009D8D
-
-#endif // CntSortPluginUid
-
--- a/phonebookengines/CntSortPlugin/rom/CntSortPlugin.iby Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __CNTSORTPLUGIN_IBY__
-#define __CNTSORTPLUGIN_IBY__
-
-ECOM_PLUGIN(cntsortplugin.dll,101f85a9.rsc)
-
-#endif
--- a/phonebookengines/CntSortPlugin/src/101f85a9.rss Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Contact model ECOM plugin resource file
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-#include "cntsortpluginuid.h"
-
-RESOURCE REGISTRY_INFO theInfo
- {
- dll_uid = KCntModelSortPluginDllUID3;
- interfaces =
- {
- INTERFACE_INFO
- {
- interface_uid = KCntModelSortPluginInterfaceUID;
- implementations =
- {
- IMPLEMENTATION_INFO
- {
- implementation_uid = KCntModelSortPluginImplementationUID;
- version_no = 1;
- display_name = "Contacts Sort Plugin";
- default_data = "/default";
- opaque_data = "";
- }
- };
- }
- };
- }
--- a/phonebookengines/CntSortPlugin/src/CCntSortPlugin.cpp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Contact model ECOM sort plugin.
-*
-*/
-
-
-// INCLUDE FILES
-#include "ccntsortplugin.h"
-
-#include <SortUtil.h>
-#include <cntdef.h>
-
-#include "csortkeyarray.h"
-
-namespace {
-
-#ifdef _DEBUG
-enum TPanicType
- {
- EPanicPreCond_CompareViewContactsL = 1,
- EPanicSortUtilFactoryReturnedNULL,
- EPanicInvalidViewParameters,
- EPanicDefaultCompareFunctionNULL,
- EPanicDefaultIsSortableFunctionNULL
- };
-
-void Panic(TPanicType aPanicType)
- {
- _LIT(KPanicTxt, "CCntSortPlugin");
- User::Panic(KPanicTxt, aPanicType);
- }
-#endif
-} // namespace
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// CCntSortPlugin::NewL
-// ---------------------------------------------------------------------------
-//
-CCntSortPlugin* CCntSortPlugin::NewL(TAny* aParams)
- {
- CCntSortPlugin* self = new(ELeave) CCntSortPlugin;
- CleanupStack::PushL( self );
- self->ConstructL(static_cast<TSortPluginParams*>(aParams));
- CleanupStack::Pop();
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// CCntSortPlugin::ConstructL
-// ---------------------------------------------------------------------------
-//
-void CCntSortPlugin::ConstructL(TSortPluginParams* aParams)
- {
- // Validate parameters
- if (!aParams ||
- (aParams->iParametersRevision != KCntSortPluginViewParamsRev1Uid))
- User::Leave(KErrArgument);
-
- TSortPluginViewParamsRev1* viewParams =
- static_cast<TSortPluginViewParamsRev1*>(aParams->iViewSortParams);
-
- __ASSERT_DEBUG(viewParams,
- Panic(EPanicInvalidViewParameters));
- __ASSERT_DEBUG(viewParams->iCompareViewContactsL,
- Panic(EPanicDefaultCompareFunctionNULL));
- __ASSERT_DEBUG(viewParams->iIsSortable,
- Panic(EPanicDefaultIsSortableFunctionNULL));
-
- iIsSortable = viewParams->iIsSortable;
-
- iSortUtil = CSortUtil::NewL();
- // Sort Util factory has to return valid pointer
- // Factory should default to european sorting if nothing else is
- // applicable
- __ASSERT_DEBUG(iSortUtil, Panic(EPanicSortUtilFactoryReturnedNULL));
-
- iLeftSortKeyArray = CSortKeyArray::NewL();
- iRightSortKeyArray = CSortKeyArray::NewL();
- }
-
-// ---------------------------------------------------------------------------
-// CCntSortPlugin::CCntSortPlugin
-// ---------------------------------------------------------------------------
-//
-CCntSortPlugin::CCntSortPlugin()
- {
- }
-
-// ---------------------------------------------------------------------------
-// CCntSortPlugin::~CCntSortPlugin
-// ---------------------------------------------------------------------------
-//
-CCntSortPlugin::~CCntSortPlugin()
- {
- delete iSortUtil;
- iSortOrder.Close();
- delete iLeftSortKeyArray;
- delete iRightSortKeyArray;
- }
-
-void CCntSortPlugin::SetSortOrderL
- (const RContactViewSortOrder& aViewSortOrder)
- {
- iSortOrder.Close();
- iSortOrder.CopyL(aViewSortOrder);
- }
-
-TInt CCntSortPlugin::SortStart(TSortStartTypes aSortStartType, TInt aCount)
- {
- TRAPD(ret, DoSortStartL(aSortStartType, aCount));
- return ret;
- }
-
-void CCntSortPlugin::DoSortStartL
- (TSortStartTypes /* aSortStartType */, TInt /* aCount */)
- {
- iLeftSortKeyArray->Reset();
- iRightSortKeyArray->Reset();
-
- const TInt count = iSortOrder.Count();
- for (TInt i = 0; i < count; ++i)
- {
- TFieldType fieldType = iSortOrder[i];
- if (fieldType == KUidContactFieldGivenNamePronunciation ||
- fieldType == KUidContactFieldFamilyNamePronunciation ||
- fieldType == KUidContactFieldCompanyNamePronunciation)
- {
- iLeftSortKeyArray->AppendL
- (TSortKey(KNullDesC, ESortKeyPronounciation));
- iRightSortKeyArray->AppendL
- (TSortKey(KNullDesC, ESortKeyPronounciation));
- }
- else
- {
- iLeftSortKeyArray->AppendL(TSortKey(KNullDesC, ESortKeyBasic));
- iRightSortKeyArray->AppendL(TSortKey(KNullDesC, ESortKeyBasic));
- }
- }
- }
-
-void CCntSortPlugin::SortCompleted()
- {
- iLeftSortKeyArray->Reset();
- iRightSortKeyArray->Reset();
- }
-
-TInt CCntSortPlugin::SortCompareViewContactsL
- (const CViewContact& aLhs, const CViewContact& aRhs)
- {
- __ASSERT_DEBUG(aLhs.FieldCount() == iSortOrder.Count(),
- Panic(EPanicPreCond_CompareViewContactsL));
- __ASSERT_DEBUG(aRhs.FieldCount() == iSortOrder.Count(),
- Panic(EPanicPreCond_CompareViewContactsL));
- __ASSERT_DEBUG(iLeftSortKeyArray &&
- iLeftSortKeyArray->SortKeyCount() == iSortOrder.Count(),
- Panic(EPanicPreCond_CompareViewContactsL));
- __ASSERT_DEBUG(iRightSortKeyArray &&
- iRightSortKeyArray->SortKeyCount() == iSortOrder.Count(),
- Panic(EPanicPreCond_CompareViewContactsL));
-
- // Change the text in the sortkeys to correspond fields in the contacts
- const TInt count = iSortOrder.Count();
- for (TInt i = 0; i < count; ++i)
- {
- iLeftSortKeyArray->SetText(aLhs.Field(i), i);
- iRightSortKeyArray->SetText(aRhs.Field(i), i);
- }
-
- return iSortUtil->Interface()->CompareItems
- (*iLeftSortKeyArray, *iRightSortKeyArray);
- }
-
-TInt CCntSortPlugin::ApiCompareViewContactsL
- (const CViewContact& aLhs, const CViewContact& aRhs)
- {
- return SortCompareViewContactsL(aLhs, aRhs);
- }
-
-TBool CCntSortPlugin::ViewContactIsSortable
- (const CViewContact& aViewContact)
- {
- return iIsSortable(aViewContact);
- }
-
-// End of File
--- a/phonebookengines/CntSortPlugin/src/CCntSortPlugin.h Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Contact model ECOM sort plugin
-*
-*/
-
-
-#ifndef __CCntSortPlugin_H__
-#define __CCntSortPlugin_H__
-
-// INCLUDES
-#include <cntviewsortplugin.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <cntviewsortpluginbase.h>
-#endif
-
-// FORWARD DECLARATIONS
-class CSortUtil;
-class CSortKeyArray;
-
-// CLASS DECLARATION
-
-/**
- * This class implements the functionality promised by
- * the CViewContactSortInterfaceDefinition definition class.
- */
-class CCntSortPlugin : public CViewContactSortPlugin
- {
- public: // Construction / Destruction
- /**
- * Two phase static constructor.
- * @param aParams Parameters for construction.
- * @return Newly created instance of CCntSortPlugin.
- */
- static CCntSortPlugin* NewL(TAny* aParams);
- ~CCntSortPlugin();
-
- private: // From CContactViewSortConfigInterface
- void SetSortOrderL(const RContactViewSortOrder& aViewSortOrder);
- TInt SortStart(TSortStartTypes aSortStartType, TInt aCount);
- void SortCompleted();
- TInt SortCompareViewContactsL
- (const CViewContact& aLhs, const CViewContact& aRhs);
- TInt ApiCompareViewContactsL
- (const CViewContact& aLhs, const CViewContact& aRhs);
- TInt CompareViewContactsL(const CViewContact& aLhs, const CViewContact& aRhs);
- TBool ViewContactIsSortable(const CViewContact& aViewContact);
-
- private: // Implementation
- /**
- * Standard C++ constructor.
- */
- CCntSortPlugin();
-
- /**
- * 2nd phase constructor.
- */
- void ConstructL(TSortPluginParams* aParams);
-
- /**
- * Do the actual sort starting.
- * @param aSortStartType Type of the sort to start.
- * @param aCount Approximate number of contacts to process.
- */
- void DoSortStartL(TSortStartTypes aSortStartType, TInt aCount);
- private: // Data
- /// Own: The sort util
- CSortUtil* iSortUtil;
- /// Currently active sort order
- RContactViewSortOrder iSortOrder;
- /// Ref: Is sortable function
- TBool(*iIsSortable)(const CViewContact& aViewContact);
- /// Own: sort key array for left hand side
- CSortKeyArray* iLeftSortKeyArray;
- /// Own: sort key array for right hand side
- CSortKeyArray* iRightSortKeyArray;
- };
-
-#endif // __CCntSortPlugin_H__
-
-// End of File
--- a/phonebookengines/CntSortPlugin/src/CSortKeyArray.cpp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Sort key array for Contact model ECOM sort plugin.
-*
-*/
-
-
-#include "csortkeyarray.h"
-
-namespace {
-
-#ifdef _DEBUG
-
-enum TPanicReason
- {
- EPanicPreCond_SetText
- };
-
-void Panic(TPanicReason aReason)
- {
- _LIT(KPanicText, "CSortKeyArray");
- User::Panic(KPanicText, aReason);
- }
-
-#endif // _DEBUG
-
-} // namespace
-
-inline CSortKeyArray::CSortKeyArray()
- {
- }
-
-CSortKeyArray* CSortKeyArray::NewL()
- {
- return new(ELeave) CSortKeyArray;
- }
-
-CSortKeyArray::~CSortKeyArray()
- {
- iKeyTypes.Close();
- iTexts.Close();
- }
-
-void CSortKeyArray::AppendL(const TSortKey& aKey)
- {
- User::LeaveIfError(iKeyTypes.Append(aKey.Type()));
- TInt err = iTexts.Append(aKey.Text());
- if (err != KErrNone)
- {
- // if appending to iTexts was not successful remove also the
- // item in iKeyTypes to keep arrays in sync.
- iKeyTypes.Remove(iKeyTypes.Count() - 1);
- User::Leave(err);
- }
- }
-
-void CSortKeyArray::SetText(const TDesC& aText, TInt aIndex)
- {
- __ASSERT_DEBUG(aIndex < iTexts.Count(), Panic(EPanicPreCond_SetText));
- iTexts[aIndex].Set(aText);
- }
-
-void CSortKeyArray::Reset()
- {
- iKeyTypes.Reset();
- iTexts.Reset();
- }
-
-TInt CSortKeyArray::SortKeyCount() const
- {
- return iKeyTypes.Count();
- }
-
-TSortKey CSortKeyArray::SortKeyAt(TInt aIndex) const
- {
- return TSortKey(iTexts[aIndex], iKeyTypes[aIndex]);
- }
-
-// End of File
--- a/phonebookengines/CntSortPlugin/src/CSortKeyArray.h Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* Sort key array for Contact model ECOM sort plugin.
-*
-*/
-
-
-#ifndef __CSortKeyArray_H__
-#define __CSortKeyArray_H__
-
-// INCLUDES
-#include <SortUtil.h>
-
-// CLASS DESCRIPTION
-/**
- * Sort key array for Contact model ECOM sort plugin.
- */
-class CSortKeyArray : public CBase,
- public MSortKeyArray
- {
- public:
- /**
- * Static constructor.
- * @return Newly created instance of this class.
- */
- static CSortKeyArray* NewL();
-
- /**
- * Standard c++ destructor.
- */
- ~CSortKeyArray();
-
- public: // Interface
- /**
- * Appends new sortkey to the array.
- * @param aKey New sortkey to append.
- */
- void AppendL(const TSortKey& aKey);
-
- /**
- * Resets the sortkey array.
- */
- void Reset();
-
- /**
- * Sets the text of the key in specified index.
- * @param aText The text to set to key in index.
- * @param aIndex The index where the key to be modified is.
- */
- void SetText(const TDesC& aText, TInt aIndex);
-
- public: // from MSortKeyArray
- TInt SortKeyCount() const;
- TSortKey SortKeyAt(TInt aIndex) const;
-
- private:
- /**
- * C++ constructor.
- */
- CSortKeyArray();
-
- private: // Data
- /// Own: Array of key types.
- RArray<TSortKeyType> iKeyTypes;
- /// Own: Array of texts that correspond to types in array iKeyTypes.
- RArray<TPtrC> iTexts;
- };
-
-#endif // __CSortKeyArray_H__
-
-// End of File
--- a/phonebookengines/CntSortPlugin/src/DllMain.cpp Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-
-// INCLUDES
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-#include "ccntsortplugin.h"
-#include "cntsortpluginuid.h"
-
-// Define the interface UIDs
-const TImplementationProxy ImplementationTable[] =
- {
- IMPLEMENTATION_PROXY_ENTRY(KCntModelSortPluginImplementationUID,
- CCntSortPlugin::NewL)
- };
-
-// The one and only exported function that is the ECom entry point
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy
- (TInt& aTableCount)
- {
- aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-
- return ImplementationTable;
- }
-
-// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/group/cntfindplugin.mmp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Build information file for contact model plugin needed for chinese find
+*
+*/
+
+
+#include "cntfindpluginuid.h"
+#include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
+
+TARGET cntfindplugin.dll
+TARGETTYPE PLUGIN
+UID KEComPluginUID2 KCntModelFindPluginDllUID3
+CAPABILITY CAP_ECOM_PLUGIN
+VENDORID VID_DEFAULT
+
+SOURCEPATH ../src
+SOURCE dllmain.cpp
+SOURCE cntfindplugin.cpp
+
+USERINCLUDE ../group
+APP_LAYER_SYSTEMINCLUDE
+// Symbian uses #include <ecom.h> in cntviewfindconfig.h
+SYSTEMINCLUDE /epoc32/include/ecom
+
+START RESOURCE 101f85f4.rss
+TARGET cntfindplugin
+TARGETPATH resource/plugins
+END
+
+LIBRARY euser.lib
+LIBRARY ECom.lib
+LIBRARY findutil.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/group/cntfindpluginuid.h Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Common header for Contact Model Find Plugin UIDs.
+*
+*
+*/
+
+#ifndef __CntFindPluginUid_H__
+#define __CntFindPluginUid_H__
+
+// Contact Model Find Plugin DLL UID
+#define KCntModelFindPluginDllUID3 0x101F85F4
+
+// Contact Model Find Plugin Interface UID
+#define KCntModelFindPluginInterfaceUID 0x101F85F5
+
+// Implementation UID
+#define KCntModelFindPluginImplementationUID 0x101F85F6
+
+//
+// Common system UIDs
+//
+
+// ECom Plugin UID 2
+#define KEComPluginUID2 0x10009D8D
+
+#endif // CntFindPluginUid
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/rom/cntfindplugin.iby Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __CNTFINDPLUGIN_IBY__
+#define __CNTFINDPLUGIN_IBY__
+
+ECOM_PLUGIN(cntfindplugin.dll,101f85f4.RSC)
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/src/101f85f4.rss Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contact model ECOM plugin resource file
+*
+*/
+
+
+#include <ecom/registryinfo.rh>
+#include "cntfindpluginuid.h"
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = KCntModelFindPluginDllUID3;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KCntModelFindPluginInterfaceUID;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KCntModelFindPluginImplementationUID;
+ version_no = 1;
+ display_name = "Contacts Find Plugin";
+ default_data = "<none>";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/src/cntfindplugin.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,106 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contact model ECOM plugin for chinese find.
+*
+*/
+
+
+// INCLUDE FILES
+#include "cntfindplugin.h"
+#include <FindUtil.h>
+
+// ========================== MEMBER FUNCTIONS ===============================
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::NewL
+// ---------------------------------------------------------------------------
+//
+CAknFindUtilBase* CAknFindUtilBase::NewL()
+ {
+ CAknFindUtilBase* self=new(ELeave) CAknFindUtilBase;
+ CleanupStack::PushL( self );
+ self->OpenL();
+ CleanupStack::Pop();
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::~CAknFindUtilBase
+// ---------------------------------------------------------------------------
+//
+CAknFindUtilBase::~CAknFindUtilBase()
+ {
+ delete iFindUtil;
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::CAknFindUtilBase
+// ---------------------------------------------------------------------------
+//
+CAknFindUtilBase::CAknFindUtilBase()
+ {
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::OpenL
+// ---------------------------------------------------------------------------
+//
+void CAknFindUtilBase::OpenL()
+ {
+ if (!iFindUtil)
+ {
+ iFindUtil = CFindUtil::NewL();
+ }
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::Close
+// ---------------------------------------------------------------------------
+//
+void CAknFindUtilBase::Close()
+ {
+ delete iFindUtil;
+ iFindUtil = NULL;
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::Match
+// ---------------------------------------------------------------------------
+//
+TBool CAknFindUtilBase::Match(const TDesC& aContactsField, const TDesC& aWord)
+ {
+ return iFindUtil->Interface()->Match(aContactsField, aWord);
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::IsWordValidForMatching
+// ---------------------------------------------------------------------------
+//
+TBool CAknFindUtilBase::IsWordValidForMatching(const TDesC& aWord)
+ {
+ return iFindUtil->Interface()->IsWordValidForMatching(aWord);
+ }
+
+// ---------------------------------------------------------------------------
+// CAknFindUtilBase::MatchRefineL
+// ---------------------------------------------------------------------------
+//
+TBool CAknFindUtilBase::MatchRefineL
+ (const TDesC& aItemString, const TDesC &aSearchText)
+ {
+ return iFindUtil->Interface()->MatchRefineL(aItemString, aSearchText);
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/src/cntfindplugin.h Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,65 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contact model ECOM plugin for chinese find.
+*
+*/
+
+
+#ifndef __CntFindPlugin_H__
+#define __CntFindPlugin_H__
+
+// INCLUDES
+#include <cntviewfindconfig.h>
+
+// FORWARD DECLARATIONS
+class CFindUtil;
+
+// CLASS DECLARATION
+
+/**
+ * This class implements the functionality promised by
+ * the CFindUtilInterface definition class.
+ */
+class CAknFindUtilBase : public CContactViewFindConfigInterface
+ {
+ public: // Construction / Destruction
+ /**
+ * Two phase static constructor.
+ * @return Newly created instance of CAknFindUtilBase.
+ */
+ static CAknFindUtilBase* NewL();
+ ~CAknFindUtilBase();
+
+ private: // From CContactViewFindConfigInterface
+ void OpenL();
+ void Close();
+ TBool Match(const TDesC& aContactsField, const TDesC& aWord);
+ TBool IsWordValidForMatching(const TDesC& aWord);
+ TBool MatchRefineL( const TDesC& aItemString, const TDesC& aSearchText);
+
+ private: // Implementation
+ /**
+ * Standard C++ constructor.
+ */
+ CAknFindUtilBase();
+
+ private: // Data
+ /// Own: Find utility that implements the actual finding functionality
+ CFindUtil* iFindUtil;
+ };
+
+#endif // __CAknFindUtilBase_H__
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntfindplugin/src/dllmain.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,53 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+// INCLUDES
+#include <e32std.h>
+#include <ecom/implementationproxy.h>
+
+#include "cntfindplugin.h"
+#include "cntfindpluginuid.h"
+
+// Define the interface UIDs
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KCntModelFindPluginImplementationUID,
+ CAknFindUtilBase::NewL)
+ };
+
+// The one and only exported function that is the ECom entry point
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy
+ (TInt& aTableCount)
+ {
+ aTableCount =
+ sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+ return ImplementationTable;
+ }
+
+/**
+ * Standard Symbian OS DLL entry point.
+ */
+#ifndef EKA2
+TBool E32Dll(TDllReason)
+ {
+ return ETrue;
+ }
+#endif // EKA2
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/group/cntsortplugin.mmp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,48 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Build information file for contact model plugin needed for japanese sort
+*
+*/
+
+
+#include "cntsortpluginuid.h"
+#include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
+
+TARGET cntsortplugin.dll
+TARGETTYPE PLUGIN
+UID KEComPluginUID2 KCntModelSortPluginDllUID3
+CAPABILITY CAP_ECOM_PLUGIN
+VENDORID VID_DEFAULT
+
+SOURCEPATH ../src
+SOURCE dllmain.cpp
+SOURCE ccntsortplugin.cpp
+SOURCE csortkeyarray.cpp
+
+USERINCLUDE ../group
+APP_LAYER_SYSTEMINCLUDE
+// Symbian uses #include <ecom.h> in cntviewsortplugin.h
+SYSTEMINCLUDE /epoc32/include/ecom
+
+START RESOURCE 101f85a9.rss
+TARGET cntsortplugin
+TARGETPATH resource/plugins
+END
+
+LIBRARY euser.lib
+LIBRARY ECom.lib
+LIBRARY cntmodel.lib
+LIBRARY sortutil.lib
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/group/cntsortpluginuid.h Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,40 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Common header for Contact Model Sort Plugin UIDs.
+*
+*
+*/
+
+#ifndef __CntSortPluginUid_H__
+#define __CntSortPluginUid_H__
+
+// Contact Model Sort Plugin DLL UID
+#define KCntModelSortPluginDllUID3 0x101F85A9
+
+// Contact Model Sort Plugin Interface UID
+#define KCntModelSortPluginInterfaceUID 0x10200FBD
+
+// Implementation UID
+#define KCntModelSortPluginImplementationUID 0x101F85AA
+
+//
+// Common system UIDs
+//
+
+// ECom Plugin UID 2
+#define KEComPluginUID2 0x10009D8D
+
+#endif // CntSortPluginUid
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/rom/cntsortplugin.iby Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,23 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+#ifndef __CNTSORTPLUGIN_IBY__
+#define __CNTSORTPLUGIN_IBY__
+
+ECOM_PLUGIN(cntsortplugin.dll,101f85a9.rsc)
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/src/101f85a9.rss Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,44 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contact model ECOM plugin resource file
+*
+*/
+
+
+#include <ecom/registryinfo.rh>
+#include "cntsortpluginuid.h"
+
+RESOURCE REGISTRY_INFO theInfo
+ {
+ dll_uid = KCntModelSortPluginDllUID3;
+ interfaces =
+ {
+ INTERFACE_INFO
+ {
+ interface_uid = KCntModelSortPluginInterfaceUID;
+ implementations =
+ {
+ IMPLEMENTATION_INFO
+ {
+ implementation_uid = KCntModelSortPluginImplementationUID;
+ version_no = 1;
+ display_name = "Contacts Sort Plugin";
+ default_data = "/default";
+ opaque_data = "";
+ }
+ };
+ }
+ };
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/src/ccntsortplugin.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,200 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contact model ECOM sort plugin.
+*
+*/
+
+
+// INCLUDE FILES
+#include "ccntsortplugin.h"
+
+#include <SortUtil.h>
+#include <cntdef.h>
+
+#include "csortkeyarray.h"
+
+namespace {
+
+#ifdef _DEBUG
+enum TPanicType
+ {
+ EPanicPreCond_CompareViewContactsL = 1,
+ EPanicSortUtilFactoryReturnedNULL,
+ EPanicInvalidViewParameters,
+ EPanicDefaultCompareFunctionNULL,
+ EPanicDefaultIsSortableFunctionNULL
+ };
+
+void Panic(TPanicType aPanicType)
+ {
+ _LIT(KPanicTxt, "CCntSortPlugin");
+ User::Panic(KPanicTxt, aPanicType);
+ }
+#endif
+} // namespace
+
+// ========================== MEMBER FUNCTIONS ===============================
+
+// ---------------------------------------------------------------------------
+// CCntSortPlugin::NewL
+// ---------------------------------------------------------------------------
+//
+CCntSortPlugin* CCntSortPlugin::NewL(TAny* aParams)
+ {
+ CCntSortPlugin* self = new(ELeave) CCntSortPlugin;
+ CleanupStack::PushL( self );
+ self->ConstructL(static_cast<TSortPluginParams*>(aParams));
+ CleanupStack::Pop();
+ return self;
+ }
+
+// ---------------------------------------------------------------------------
+// CCntSortPlugin::ConstructL
+// ---------------------------------------------------------------------------
+//
+void CCntSortPlugin::ConstructL(TSortPluginParams* aParams)
+ {
+ // Validate parameters
+ if (!aParams ||
+ (aParams->iParametersRevision != KCntSortPluginViewParamsRev1Uid))
+ User::Leave(KErrArgument);
+
+ TSortPluginViewParamsRev1* viewParams =
+ static_cast<TSortPluginViewParamsRev1*>(aParams->iViewSortParams);
+
+ __ASSERT_DEBUG(viewParams,
+ Panic(EPanicInvalidViewParameters));
+ __ASSERT_DEBUG(viewParams->iCompareViewContactsL,
+ Panic(EPanicDefaultCompareFunctionNULL));
+ __ASSERT_DEBUG(viewParams->iIsSortable,
+ Panic(EPanicDefaultIsSortableFunctionNULL));
+
+ iIsSortable = viewParams->iIsSortable;
+
+ iSortUtil = CSortUtil::NewL();
+ // Sort Util factory has to return valid pointer
+ // Factory should default to european sorting if nothing else is
+ // applicable
+ __ASSERT_DEBUG(iSortUtil, Panic(EPanicSortUtilFactoryReturnedNULL));
+
+ iLeftSortKeyArray = CSortKeyArray::NewL();
+ iRightSortKeyArray = CSortKeyArray::NewL();
+ }
+
+// ---------------------------------------------------------------------------
+// CCntSortPlugin::CCntSortPlugin
+// ---------------------------------------------------------------------------
+//
+CCntSortPlugin::CCntSortPlugin()
+ {
+ }
+
+// ---------------------------------------------------------------------------
+// CCntSortPlugin::~CCntSortPlugin
+// ---------------------------------------------------------------------------
+//
+CCntSortPlugin::~CCntSortPlugin()
+ {
+ delete iSortUtil;
+ iSortOrder.Close();
+ delete iLeftSortKeyArray;
+ delete iRightSortKeyArray;
+ }
+
+void CCntSortPlugin::SetSortOrderL
+ (const RContactViewSortOrder& aViewSortOrder)
+ {
+ iSortOrder.Close();
+ iSortOrder.CopyL(aViewSortOrder);
+ }
+
+TInt CCntSortPlugin::SortStart(TSortStartTypes aSortStartType, TInt aCount)
+ {
+ TRAPD(ret, DoSortStartL(aSortStartType, aCount));
+ return ret;
+ }
+
+void CCntSortPlugin::DoSortStartL
+ (TSortStartTypes /* aSortStartType */, TInt /* aCount */)
+ {
+ iLeftSortKeyArray->Reset();
+ iRightSortKeyArray->Reset();
+
+ const TInt count = iSortOrder.Count();
+ for (TInt i = 0; i < count; ++i)
+ {
+ TFieldType fieldType = iSortOrder[i];
+ if (fieldType == KUidContactFieldGivenNamePronunciation ||
+ fieldType == KUidContactFieldFamilyNamePronunciation ||
+ fieldType == KUidContactFieldCompanyNamePronunciation)
+ {
+ iLeftSortKeyArray->AppendL
+ (TSortKey(KNullDesC, ESortKeyPronounciation));
+ iRightSortKeyArray->AppendL
+ (TSortKey(KNullDesC, ESortKeyPronounciation));
+ }
+ else
+ {
+ iLeftSortKeyArray->AppendL(TSortKey(KNullDesC, ESortKeyBasic));
+ iRightSortKeyArray->AppendL(TSortKey(KNullDesC, ESortKeyBasic));
+ }
+ }
+ }
+
+void CCntSortPlugin::SortCompleted()
+ {
+ iLeftSortKeyArray->Reset();
+ iRightSortKeyArray->Reset();
+ }
+
+TInt CCntSortPlugin::SortCompareViewContactsL
+ (const CViewContact& aLhs, const CViewContact& aRhs)
+ {
+ __ASSERT_DEBUG(aLhs.FieldCount() == iSortOrder.Count(),
+ Panic(EPanicPreCond_CompareViewContactsL));
+ __ASSERT_DEBUG(aRhs.FieldCount() == iSortOrder.Count(),
+ Panic(EPanicPreCond_CompareViewContactsL));
+ __ASSERT_DEBUG(iLeftSortKeyArray &&
+ iLeftSortKeyArray->SortKeyCount() == iSortOrder.Count(),
+ Panic(EPanicPreCond_CompareViewContactsL));
+ __ASSERT_DEBUG(iRightSortKeyArray &&
+ iRightSortKeyArray->SortKeyCount() == iSortOrder.Count(),
+ Panic(EPanicPreCond_CompareViewContactsL));
+
+ // Change the text in the sortkeys to correspond fields in the contacts
+ const TInt count = iSortOrder.Count();
+ for (TInt i = 0; i < count; ++i)
+ {
+ iLeftSortKeyArray->SetText(aLhs.Field(i), i);
+ iRightSortKeyArray->SetText(aRhs.Field(i), i);
+ }
+
+ return iSortUtil->Interface()->CompareItems
+ (*iLeftSortKeyArray, *iRightSortKeyArray);
+ }
+
+TInt CCntSortPlugin::ApiCompareViewContactsL
+ (const CViewContact& aLhs, const CViewContact& aRhs)
+ {
+ return SortCompareViewContactsL(aLhs, aRhs);
+ }
+
+TBool CCntSortPlugin::ViewContactIsSortable
+ (const CViewContact& aViewContact)
+ {
+ return iIsSortable(aViewContact);
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/src/ccntsortplugin.h Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,93 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Contact model ECOM sort plugin
+*
+*/
+
+
+#ifndef __CCntSortPlugin_H__
+#define __CCntSortPlugin_H__
+
+// INCLUDES
+#include <cntviewsortplugin.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <cntviewsortpluginbase.h>
+#endif
+
+// FORWARD DECLARATIONS
+class CSortUtil;
+class CSortKeyArray;
+
+// CLASS DECLARATION
+
+/**
+ * This class implements the functionality promised by
+ * the CViewContactSortInterfaceDefinition definition class.
+ */
+class CCntSortPlugin : public CViewContactSortPlugin
+ {
+ public: // Construction / Destruction
+ /**
+ * Two phase static constructor.
+ * @param aParams Parameters for construction.
+ * @return Newly created instance of CCntSortPlugin.
+ */
+ static CCntSortPlugin* NewL(TAny* aParams);
+ ~CCntSortPlugin();
+
+ private: // From CContactViewSortConfigInterface
+ void SetSortOrderL(const RContactViewSortOrder& aViewSortOrder);
+ TInt SortStart(TSortStartTypes aSortStartType, TInt aCount);
+ void SortCompleted();
+ TInt SortCompareViewContactsL
+ (const CViewContact& aLhs, const CViewContact& aRhs);
+ TInt ApiCompareViewContactsL
+ (const CViewContact& aLhs, const CViewContact& aRhs);
+ TInt CompareViewContactsL(const CViewContact& aLhs, const CViewContact& aRhs);
+ TBool ViewContactIsSortable(const CViewContact& aViewContact);
+
+ private: // Implementation
+ /**
+ * Standard C++ constructor.
+ */
+ CCntSortPlugin();
+
+ /**
+ * 2nd phase constructor.
+ */
+ void ConstructL(TSortPluginParams* aParams);
+
+ /**
+ * Do the actual sort starting.
+ * @param aSortStartType Type of the sort to start.
+ * @param aCount Approximate number of contacts to process.
+ */
+ void DoSortStartL(TSortStartTypes aSortStartType, TInt aCount);
+ private: // Data
+ /// Own: The sort util
+ CSortUtil* iSortUtil;
+ /// Currently active sort order
+ RContactViewSortOrder iSortOrder;
+ /// Ref: Is sortable function
+ TBool(*iIsSortable)(const CViewContact& aViewContact);
+ /// Own: sort key array for left hand side
+ CSortKeyArray* iLeftSortKeyArray;
+ /// Own: sort key array for right hand side
+ CSortKeyArray* iRightSortKeyArray;
+ };
+
+#endif // __CCntSortPlugin_H__
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/src/csortkeyarray.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,91 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Sort key array for Contact model ECOM sort plugin.
+*
+*/
+
+
+#include "csortkeyarray.h"
+
+namespace {
+
+#ifdef _DEBUG
+
+enum TPanicReason
+ {
+ EPanicPreCond_SetText
+ };
+
+void Panic(TPanicReason aReason)
+ {
+ _LIT(KPanicText, "CSortKeyArray");
+ User::Panic(KPanicText, aReason);
+ }
+
+#endif // _DEBUG
+
+} // namespace
+
+inline CSortKeyArray::CSortKeyArray()
+ {
+ }
+
+CSortKeyArray* CSortKeyArray::NewL()
+ {
+ return new(ELeave) CSortKeyArray;
+ }
+
+CSortKeyArray::~CSortKeyArray()
+ {
+ iKeyTypes.Close();
+ iTexts.Close();
+ }
+
+void CSortKeyArray::AppendL(const TSortKey& aKey)
+ {
+ User::LeaveIfError(iKeyTypes.Append(aKey.Type()));
+ TInt err = iTexts.Append(aKey.Text());
+ if (err != KErrNone)
+ {
+ // if appending to iTexts was not successful remove also the
+ // item in iKeyTypes to keep arrays in sync.
+ iKeyTypes.Remove(iKeyTypes.Count() - 1);
+ User::Leave(err);
+ }
+ }
+
+void CSortKeyArray::SetText(const TDesC& aText, TInt aIndex)
+ {
+ __ASSERT_DEBUG(aIndex < iTexts.Count(), Panic(EPanicPreCond_SetText));
+ iTexts[aIndex].Set(aText);
+ }
+
+void CSortKeyArray::Reset()
+ {
+ iKeyTypes.Reset();
+ iTexts.Reset();
+ }
+
+TInt CSortKeyArray::SortKeyCount() const
+ {
+ return iKeyTypes.Count();
+ }
+
+TSortKey CSortKeyArray::SortKeyAt(TInt aIndex) const
+ {
+ return TSortKey(iTexts[aIndex], iKeyTypes[aIndex]);
+ }
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/src/csortkeyarray.h Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,83 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+* Sort key array for Contact model ECOM sort plugin.
+*
+*/
+
+
+#ifndef __CSortKeyArray_H__
+#define __CSortKeyArray_H__
+
+// INCLUDES
+#include <SortUtil.h>
+
+// CLASS DESCRIPTION
+/**
+ * Sort key array for Contact model ECOM sort plugin.
+ */
+class CSortKeyArray : public CBase,
+ public MSortKeyArray
+ {
+ public:
+ /**
+ * Static constructor.
+ * @return Newly created instance of this class.
+ */
+ static CSortKeyArray* NewL();
+
+ /**
+ * Standard c++ destructor.
+ */
+ ~CSortKeyArray();
+
+ public: // Interface
+ /**
+ * Appends new sortkey to the array.
+ * @param aKey New sortkey to append.
+ */
+ void AppendL(const TSortKey& aKey);
+
+ /**
+ * Resets the sortkey array.
+ */
+ void Reset();
+
+ /**
+ * Sets the text of the key in specified index.
+ * @param aText The text to set to key in index.
+ * @param aIndex The index where the key to be modified is.
+ */
+ void SetText(const TDesC& aText, TInt aIndex);
+
+ public: // from MSortKeyArray
+ TInt SortKeyCount() const;
+ TSortKey SortKeyAt(TInt aIndex) const;
+
+ private:
+ /**
+ * C++ constructor.
+ */
+ CSortKeyArray();
+
+ private: // Data
+ /// Own: Array of key types.
+ RArray<TSortKeyType> iKeyTypes;
+ /// Own: Array of texts that correspond to types in array iKeyTypes.
+ RArray<TPtrC> iTexts;
+ };
+
+#endif // __CSortKeyArray_H__
+
+// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines/cntsortplugin/src/dllmain.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,42 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:
+*
+*/
+
+
+// INCLUDES
+#include <e32std.h>
+#include <ecom/implementationproxy.h>
+
+#include "ccntsortplugin.h"
+#include "cntsortpluginuid.h"
+
+// Define the interface UIDs
+const TImplementationProxy ImplementationTable[] =
+ {
+ IMPLEMENTATION_PROXY_ENTRY(KCntModelSortPluginImplementationUID,
+ CCntSortPlugin::NewL)
+ };
+
+// The one and only exported function that is the ECom entry point
+EXPORT_C const TImplementationProxy* ImplementationGroupProxy
+ (TInt& aTableCount)
+ {
+ aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
+
+ return ImplementationTable;
+ }
+
+// End of File
--- a/phonebookengines_old/contactsmodel/cntmatchlog/group/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Contacts Matching plugin for logeng
-//
-//
-
-PRJ_EXPORTS
-cntmatchlog.iby /epoc32/rom/include/cntmatchlog.iby
-
-PRJ_MMPFILES
-cntmatchlog.mmp
-
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines_old/contactsmodel/cntmatchlog/group/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,24 @@
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contacts Matching plugin for logeng
+//
+//
+
+PRJ_EXPORTS
+cntmatchlog.iby /epoc32/rom/include/cntmatchlog.iby
+
+PRJ_MMPFILES
+cntmatchlog.mmp
+
+
--- a/phonebookengines_old/contactsmodel/group/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Contacts application engine // dbms version
-//
-//
-
-#include "./COMMON.INF"
-
-PRJ_MMPFILES
-./CNTMODEL.MMP
-
-
-PRJ_TESTMMPFILES
-../tsrc/CNTTUTIL.MMP support
-../tsrc/T_RecoverView.mmp
-../tsrc/T_NOMACH.MMP
-../tsrc/T_Sec_AsyncOpen.mmp
-../tsrc/t_cnt_backup.mmp
-../tsrc/t_bench.mmp manual
-../tsrc/cntmodel2/T_PlTransactionManager.mmp
-../tsrc/T_ViewSortPlugin.mmp
-../tsrc/T_DBASE2.MMP
-../tsrc/t_lowdiskspace.mmp
-../tsrc/t_platsec.mmp
-../tsrc/T_viewcontactid.mmp
-../tsrc/performance/T_Performance.mmp
-../tsrc/t_HintExtension.mmp
-../tsrc/T_datacompatibility.mmp
-
-// Platform Security
-../tsrc/T_SEC_CNTDBASE.MMP
-
-// Persistence Layer / Contacts Model Performance Tests
-../tsrc/T_PlPerformance.mmp
-
-//Persistence Layer Tests
-../tsrc/T_PersistenceLayer.mmp
-
-// Contact Packager Tests
-../tsrc/cntmodel2/T_Packager.mmp
-../tsrc/cntmodel2/T_CProgressNotification.mmp
-../tsrc/T_PlPerformanceAPI.mmp
-../tsrc/PackagerClientServer/Server/group/T_PackagerTestServer.mmp support
-../tsrc/PackagerClientServer/Client/group/T_PackagerTestClient.mmp support
-../tsrc/PackagerClientServer/Test/group/T_PackagerTestHarness.mmp
-
-
-#include "../tsrc/Integration/CntPerfTest/group/BLD.INF"
-
-#include "../tsrc/Integration/PerfFuncSuite/group/bld.inf"
-
-#include "../tsrc/Integration/TCntPolice/group/BLD.INF"
-
-#include "../tsrc/Integration/TestImpExvCard/group/bld.inf"
-
-
-PRJ_TESTEXPORTS
-
-//Data compatibility v4
-../tsrc/databases/FormatV4.cdb z:/core-apps/app-engines/cntmodel/databases/formatv4.cdb
-
-//Data compatibility v5
-../tsrc/databases/FormatV5.cdb z:/core-apps/app-engines/cntmodel/databases/formatv5.cdb
-
-//Data compatibility v6 with 10 contacts
-../tsrc/databases/FormatV6-10.cdb z:/core-apps/app-engines/cntmodel/databases/formatv6-10.cdb
-
-//Data compatibility v7 with 25 contacts
-../tsrc/databases/FormatV7-25.cdb z:/core-apps/app-engines/cntmodel/databases/formatv7-25.cdb
-
-//Data compatibility v8 with 100 contacts
-../tsrc/databases/DBS_100065FF_performance_100_4.cdb z:/core-apps/app-engines/cntmodel/databases/dbs_100065ff_performance_100_4.cdb
-
-//Data compatibility v4 with 4 contacts
-../tsrc/databases/FormatV4-4.cdb z:/core-apps/app-engines/cntmodel/databases/formatv4-4.cdb
-
-// Contacts Platsec
-../tsrc/databases/contacts58920.cdb z:/core-apps/app-engines/cntmodel/databases/contacts58920.cdb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines_old/contactsmodel/group/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,89 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contacts application engine // dbms version
+//
+//
+
+#include "./COMMON.INF"
+
+PRJ_MMPFILES
+./CNTMODEL.MMP
+
+
+PRJ_TESTMMPFILES
+../tsrc/CNTTUTIL.MMP support
+../tsrc/T_RecoverView.mmp
+../tsrc/T_NOMACH.MMP
+../tsrc/T_Sec_AsyncOpen.mmp
+../tsrc/t_cnt_backup.mmp
+../tsrc/t_bench.mmp manual
+../tsrc/cntmodel2/T_PlTransactionManager.mmp
+../tsrc/T_ViewSortPlugin.mmp
+../tsrc/T_DBASE2.MMP
+../tsrc/t_lowdiskspace.mmp
+../tsrc/t_platsec.mmp
+../tsrc/T_viewcontactid.mmp
+../tsrc/performance/T_Performance.mmp
+../tsrc/t_HintExtension.mmp
+../tsrc/T_datacompatibility.mmp
+
+// Platform Security
+../tsrc/T_SEC_CNTDBASE.MMP
+
+// Persistence Layer / Contacts Model Performance Tests
+../tsrc/T_PlPerformance.mmp
+
+//Persistence Layer Tests
+../tsrc/T_PersistenceLayer.mmp
+
+// Contact Packager Tests
+../tsrc/cntmodel2/T_Packager.mmp
+../tsrc/cntmodel2/T_CProgressNotification.mmp
+../tsrc/T_PlPerformanceAPI.mmp
+../tsrc/PackagerClientServer/Server/group/T_PackagerTestServer.mmp support
+../tsrc/PackagerClientServer/Client/group/T_PackagerTestClient.mmp support
+../tsrc/PackagerClientServer/Test/group/T_PackagerTestHarness.mmp
+
+
+#include "../tsrc/Integration/CntPerfTest/group/BLD.INF"
+
+#include "../tsrc/Integration/PerfFuncSuite/group/bld.inf"
+
+#include "../tsrc/Integration/TCntPolice/group/BLD.INF"
+
+#include "../tsrc/Integration/TestImpExvCard/group/bld.inf"
+
+
+PRJ_TESTEXPORTS
+
+//Data compatibility v4
+../tsrc/databases/FormatV4.cdb z:/core-apps/app-engines/cntmodel/databases/formatv4.cdb
+
+//Data compatibility v5
+../tsrc/databases/FormatV5.cdb z:/core-apps/app-engines/cntmodel/databases/formatv5.cdb
+
+//Data compatibility v6 with 10 contacts
+../tsrc/databases/FormatV6-10.cdb z:/core-apps/app-engines/cntmodel/databases/formatv6-10.cdb
+
+//Data compatibility v7 with 25 contacts
+../tsrc/databases/FormatV7-25.cdb z:/core-apps/app-engines/cntmodel/databases/formatv7-25.cdb
+
+//Data compatibility v8 with 100 contacts
+../tsrc/databases/DBS_100065FF_performance_100_4.cdb z:/core-apps/app-engines/cntmodel/databases/dbs_100065ff_performance_100_4.cdb
+
+//Data compatibility v4 with 4 contacts
+../tsrc/databases/FormatV4-4.cdb z:/core-apps/app-engines/cntmodel/databases/formatv4-4.cdb
+
+// Contacts Platsec
+../tsrc/databases/contacts58920.cdb z:/core-apps/app-engines/cntmodel/databases/contacts58920.cdb
--- a/phonebookengines_old/contactsmodel/tsrc/Connectivity.vcf Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/Connectivity.vcf Wed Jul 21 11:09:07 2010 +0300
@@ -1,11 +1,11 @@
-BEGIN:VCARD
-VERSION:2.1
-N;CHARSET=UTF-8:Keskus; ; ; ;
-ORG;CHARSET=UTF-8: ;
-ADR;QUOTED-PRINTABLE;CHARSET=UTF-8: ;; ; ; ; ;
-ADR;WORK;QUOTED-PRINTABLE;CHARSET=UTF-8: ;; ; ; ; ;
-ADR;HOME;QUOTED-PRINTABLE;CHARSET=UTF-8: ;; ; ; ; ;
-TEL;CHARSET=UTF-8:+358718008000
-;CHARSET=UTF-8:
-;CHARSET=UTF-8:
+BEGIN:VCARD
+VERSION:2.1
+N;CHARSET=UTF-8:Keskus; ; ; ;
+ORG;CHARSET=UTF-8: ;
+ADR;QUOTED-PRINTABLE;CHARSET=UTF-8: ;; ; ; ; ;
+ADR;WORK;QUOTED-PRINTABLE;CHARSET=UTF-8: ;; ; ; ; ;
+ADR;HOME;QUOTED-PRINTABLE;CHARSET=UTF-8: ;; ; ; ; ;
+TEL;CHARSET=UTF-8:+358718008000
+;CHARSET=UTF-8:
+;CHARSET=UTF-8:
END:VCARD
\ No newline at end of file
--- a/phonebookengines_old/contactsmodel/tsrc/Integration/CntPerfTest/group/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-#include "../group/common.inf"
-
-PRJ_TESTEXPORTS
-
-../Scripts/ContactViewTest.script c:/cntperftest/scripts/contactviewtest.script
-
-PRJ_TESTMMPFILES
-// specify the .mmp files required for building any test programs here
-//
-// you can specify "manual" to denote that a test should be listed in a generated
-// batch file for running a group of tests which require user input during testing.
-// you can specify "support" to denote that a file is a test support file and shouldn't
-// be listed in a batch file for running a group of tests
-// By default, each test will be listed in a batch file for running a group of tests
-// which can be left to run without requiring watching over by the person running the tests,
-// i.e. tests where no user input is required. The default will apply if neither "manual"
-// or "support" is specified.
-
-./CntPerfTestServer.mmp support
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines_old/contactsmodel/tsrc/Integration/CntPerfTest/group/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,34 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include "../group/common.inf"
+
+PRJ_TESTEXPORTS
+
+../Scripts/ContactViewTest.script c:/cntperftest/scripts/contactviewtest.script
+
+PRJ_TESTMMPFILES
+// specify the .mmp files required for building any test programs here
+//
+// you can specify "manual" to denote that a test should be listed in a generated
+// batch file for running a group of tests which require user input during testing.
+// you can specify "support" to denote that a file is a test support file and shouldn't
+// be listed in a batch file for running a group of tests
+// By default, each test will be listed in a batch file for running a group of tests
+// which can be left to run without requiring watching over by the person running the tests,
+// i.e. tests where no user input is required. The default will apply if neither "manual"
+// or "support" is specified.
+
+./CntPerfTestServer.mmp support
--- a/phonebookengines_old/contactsmodel/tsrc/Integration/TCntPolice/group/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_TESTEXPORTS
-
-../scripts/Cap_80000004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub.script
-../scripts/Cap_00010004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_00010004_te_cntsrv_api_policingsub.script
-../scripts/Cap_00008004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_00008004_te_cntsrv_api_policingsub.script
-../scripts/Cap_00000004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub.script
-
-../scripts/TE_Cntsrv_API_Policing.script c:/testdata/scripts/te_cntsrv_api_policing.script
-
-TE_Cntsrv_API_Policing.IBY /epoc32/rom/include/te_cntsrv_api_policing.iby
-
-
-PRJ_TESTMMPFILES
-
-TE_Cntsrv_API_Policing.MMP support
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines_old/contactsmodel/tsrc/Integration/TCntPolice/group/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,31 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_TESTEXPORTS
+
+../scripts/Cap_80000004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub.script
+../scripts/Cap_00010004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_00010004_te_cntsrv_api_policingsub.script
+../scripts/Cap_00008004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_00008004_te_cntsrv_api_policingsub.script
+../scripts/Cap_00000004_TE_Cntsrv_API_PolicingSub.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub.script
+
+../scripts/TE_Cntsrv_API_Policing.script c:/testdata/scripts/te_cntsrv_api_policing.script
+
+TE_Cntsrv_API_Policing.IBY /epoc32/rom/include/te_cntsrv_api_policing.iby
+
+
+PRJ_TESTMMPFILES
+
+TE_Cntsrv_API_Policing.MMP support
+
--- a/phonebookengines_old/contactsmodel/tsrc/Integration/TCntPolice/groupsql/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-PRJ_TESTEXPORTS
-
-../scriptssql/cap_80000004_te_cntsrv_api_policingsub_1.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub_1.script
-../scriptssql/cap_80000004_te_cntsrv_api_policingsub_2.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub_2.script
-../scriptssql/cap_80000004_te_cntsrv_api_policingsub_2.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub_3.script
-../scriptssql/cap_00010004_te_cntsrv_api_policingsub.script c:/testdata/scripts/cap_00010004_te_cntsrv_api_policingsub.script
-../scriptssql/cap_00008004_te_cntsrv_api_policingsub.script c:/testdata/scripts/cap_00008004_te_cntsrv_api_policingsub.script
-../scriptssql/cap_00000004_te_cntsrv_api_policingsub_1.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_1.script
-../scriptssql/cap_00000004_te_cntsrv_api_policingsub_2.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_2.script
-../scriptssql/cap_00000004_te_cntsrv_api_policingsub_3.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_3.script
-../scriptssql/cap_00000004_te_cntsrv_api_policingsub_4.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_4.script
-../scriptssql/cap_00000004_te_cntsrv_api_policingsub_4.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_5.script
-../scriptssql/te_cntsrv_api_policing.script c:/testdata/scripts/te_cntsrv_api_policing.script
-
-TE_Cntsrv_API_Policing.IBY /epoc32/rom/include/te_cntsrv_api_policing.iby
-
-
-PRJ_TESTMMPFILES
-
-TE_Cntsrv_API_Policing.MMP support
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines_old/contactsmodel/tsrc/Integration/TCntPolice/groupsql/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,36 @@
+// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+PRJ_TESTEXPORTS
+
+../scriptssql/cap_80000004_te_cntsrv_api_policingsub_1.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub_1.script
+../scriptssql/cap_80000004_te_cntsrv_api_policingsub_2.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub_2.script
+../scriptssql/cap_80000004_te_cntsrv_api_policingsub_2.script c:/testdata/scripts/cap_80000004_te_cntsrv_api_policingsub_3.script
+../scriptssql/cap_00010004_te_cntsrv_api_policingsub.script c:/testdata/scripts/cap_00010004_te_cntsrv_api_policingsub.script
+../scriptssql/cap_00008004_te_cntsrv_api_policingsub.script c:/testdata/scripts/cap_00008004_te_cntsrv_api_policingsub.script
+../scriptssql/cap_00000004_te_cntsrv_api_policingsub_1.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_1.script
+../scriptssql/cap_00000004_te_cntsrv_api_policingsub_2.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_2.script
+../scriptssql/cap_00000004_te_cntsrv_api_policingsub_3.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_3.script
+../scriptssql/cap_00000004_te_cntsrv_api_policingsub_4.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_4.script
+../scriptssql/cap_00000004_te_cntsrv_api_policingsub_4.script c:/testdata/scripts/cap_00000004_te_cntsrv_api_policingsub_5.script
+../scriptssql/te_cntsrv_api_policing.script c:/testdata/scripts/te_cntsrv_api_policing.script
+
+TE_Cntsrv_API_Policing.IBY /epoc32/rom/include/te_cntsrv_api_policing.iby
+
+
+PRJ_TESTMMPFILES
+
+TE_Cntsrv_API_Policing.MMP support
+
--- a/phonebookengines_old/contactsmodel/tsrc/Integration/TestContactSuite/scripts/ContactTestCases.ini Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/Integration/TestContactSuite/scripts/ContactTestCases.ini Wed Jul 21 11:09:07 2010 +0300
@@ -1,615 +1,615 @@
[add_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
+fieldname=Assistant
+fieldval=Srikanth
[add_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
+fieldname=Assistant-Tel
+fieldval=23456
[add_field_anni]
-fieldname=Anniversary
-year=1974
-month=8
-day=6
+fieldname=Anniversary
+year=1974
+month=8
+day=6
[add_field_spouse]
-fieldname=Spouse
-fieldval=wife
+fieldname=Spouse
+fieldval=wife
[add_field_children]
-fieldname=Children
-fieldval=child
+fieldname=Children
+fieldval=child
[add_field_class]
-fieldname=Class
-fieldval=Private
+fieldname=Class
+fieldval=Private
[add_field_dept]
-fieldname=Department
-fieldval=Symbian
+fieldname=Department
+fieldval=Symbian
[add_field_blank_asst]
-fieldname=Assistant
-fieldval=
+fieldname=Assistant
+fieldval=
[add_field_blank_asst-tel]
-fieldname=Assistant-Tel
-fieldval=
+fieldname=Assistant-Tel
+fieldval=
[add_field_zero_anni]
-fieldname=Anniversary
-year=0
-month=0
-day=0
+fieldname=Anniversary
+year=0
+month=0
+day=0
[add_field_blank_spouse]
-fieldname=Spouse
-fieldval=
+fieldname=Spouse
+fieldval=
[add_field_blank_children]
-fieldname=Children
-fieldval=
+fieldname=Children
+fieldval=
[add_field_blank_class]
-fieldname=Class
-fieldval=
+fieldname=Class
+fieldval=
[add_field_blank_dept]
-fieldname=Department
-fieldval=
+fieldname=Department
+fieldval=
[add_field_boundary_asst]
-fieldname=Assistant
-fieldval=Adding new contact fields to the new contactsAdding new contact fields to the existing contactsDeleting new contact fields from contacts Deleting new contact fieldsfrom existingcontactspdating new contact fields toAdding new contact fields to theTemp venkatesh
+fieldname=Assistant
+fieldval=Adding new contact fields to the new contactsAdding new contact fields to the existing contactsDeleting new contact fields from contacts Deleting new contact fieldsfrom existingcontactspdating new contact fields toAdding new contact fields to theTemp venkatesh
[add_field_boundary_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456788900
+fieldname=Assistant-Tel
+fieldval=23456788900
[add_field_boundary_anni]
-fieldname=Anniversary
-year=1975
-month=8
-day=7
+fieldname=Anniversary
+year=1975
+month=8
+day=7
[add_field_boundary_spouse]
-fieldname=Spouse
-fieldval=xxxxxxxxxxxx
+fieldname=Spouse
+fieldval=xxxxxxxxxxxx
[add_field_boundary_children]
-fieldname=Children
-fieldval=erererertttytytytyty
+fieldname=Children
+fieldval=erererertttytytytyty
[add_field_boundary_class]
-fieldname=Class
-fieldval=xxxxxxxxxxxx
+fieldname=Class
+fieldval=xxxxxxxxxxxx
[add_field_boundary_dept]
-fieldname=Department
-fieldval=dddddddddddddddddddddd
+fieldname=Department
+fieldval=dddddddddddddddddddddd
[add_couple_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-flag=couple
+fieldname=Assistant
+fieldval=Srikanth
+flag=couple
[add_couple_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-flag=couple
+fieldname=Assistant-Tel
+fieldval=23456
+flag=couple
[add_couple_field_anni]
-fieldname=Anniversary
-flag=couple
-year=1975
-month=8
-day=7
+fieldname=Anniversary
+flag=couple
+year=1975
+month=8
+day=7
[add_couple_field_spouse]
-fieldname=Spouse
-fieldval=wife
-flag=couple
+fieldname=Spouse
+fieldval=wife
+flag=couple
[add_couple_field_children]
-fieldname=Children
-fieldval=child
-flag=couple
+fieldname=Children
+fieldval=child
+flag=couple
[add_couple_field_class]
-fieldname=Class
-fieldval=Private
-flag=couple
+fieldname=Class
+fieldval=Private
+flag=couple
[add_couple_field_dept]
-fieldname=Department
-fieldval=Symbian
-flag=couple
+fieldname=Department
+fieldval=Symbian
+flag=couple
[add_all_with_data_fields]
-flag=all
-asstfieldval=Srikanth
-assttelfieldval=23456
-spousefieldval=wife
-childrenfieldval=child
-classfieldval=Private
-deptfieldval=Symbian
-year=1975
-month=8
-day=7
+flag=all
+asstfieldval=Srikanth
+assttelfieldval=23456
+spousefieldval=wife
+childrenfieldval=child
+classfieldval=Private
+deptfieldval=Symbian
+year=1975
+month=8
+day=7
[add_all_without_data_fields]
-flag=all
-asstfieldval=
-assttelfieldval=
-spousefieldval=
-childrenfieldval=
-classfieldval=
-deptfieldval=
-year=0
-month=0
-day=0
+flag=all
+asstfieldval=
+assttelfieldval=
+spousefieldval=
+childrenfieldval=
+classfieldval=
+deptfieldval=
+year=0
+month=0
+day=0
[open_exist_add_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
+fieldname=Assistant
+fieldval=Srikanth
[open_exist_add_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
+fieldname=Assistant-Tel
+fieldval=23456
[open_exist_add_field_anni]
-fieldname=Anniversary
-year=1974
-month=8
-day=6
+fieldname=Anniversary
+year=1974
+month=8
+day=6
[open_exist_add_field_spouse]
-fieldname=Spouse
-fieldval=wife
+fieldname=Spouse
+fieldval=wife
[open_exist_add_field_children]
-fieldname=Children
-fieldval=child
+fieldname=Children
+fieldval=child
[open_exist_add_field_class]
-fieldname=Class
-fieldval=Private
+fieldname=Class
+fieldval=Private
[open_exist_add_fieldt_dept]
-fieldname=Department
-fieldval=Symbian
+fieldname=Department
+fieldval=Symbian
[update_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-updatedvalue=sougata
+fieldname=Assistant
+fieldval=Srikanth
+updatedvalue=sougata
[update_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-updatedvalue=2345634
+fieldname=Assistant-Tel
+fieldval=23456
+updatedvalue=2345634
[update_field_anni]
-fieldname=Anniversary
-year=1974
-month=8
-day=6
-updateyear=1977
-updatemonth=1
-updateday=24
+fieldname=Anniversary
+year=1974
+month=8
+day=6
+updateyear=1977
+updatemonth=1
+updateday=24
[update_field_spouse]
-fieldname=Spouse
-fieldval=wife
-updatedvalue=hello
+fieldname=Spouse
+fieldval=wife
+updatedvalue=hello
[update_field_children]
-fieldname=Children
-fieldval=child
-updatedvalue=cccc
+fieldname=Children
+fieldval=child
+updatedvalue=cccc
[update_field_class]
-fieldname=Class
-fieldval=Private
-updatedvalue=Public
+fieldname=Class
+fieldval=Private
+updatedvalue=Public
[update_field_dept]
-fieldname=Department
-fieldval=Symbian
-updatedvalue=Finance
+fieldname=Department
+fieldval=Symbian
+updatedvalue=Finance
[delete_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
+fieldname=Assistant
+fieldval=Srikanth
[delete_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
+fieldname=Assistant-Tel
+fieldval=23456
[delete_field_anni]
-fieldname=Anniversary
-fieldval=
-year=1974
-month=8
-day=6
+fieldname=Anniversary
+fieldval=
+year=1974
+month=8
+day=6
[delete_field_spouse]
-fieldname=Spouse
-fieldval=wife
+fieldname=Spouse
+fieldval=wife
[delete_field_children]
-fieldname=Children
-fieldval=child
+fieldname=Children
+fieldval=child
[delete_field_class]
-fieldname=Class
-fieldval=Private
+fieldname=Class
+fieldval=Private
[delete_field_dept]
-fieldname=Department
-fieldval=Symbian
+fieldname=Department
+fieldval=Symbian
[delete_exist_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-flagdelete=exist
+fieldname=Assistant
+fieldval=Srikanth
+flagdelete=exist
[delete_exist_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-flagdelete=exist
+fieldname=Assistant-Tel
+fieldval=23456
+flagdelete=exist
[delete_exist_field_anni]
-fieldname=Anniversary
-year=1974
-month=8
-day=6
-flagdelete=exist
+fieldname=Anniversary
+year=1974
+month=8
+day=6
+flagdelete=exist
[delete_exist_field_spouse]
-fieldname=Spouse
-fieldval=wife
-flagdelete=exist
+fieldname=Spouse
+fieldval=wife
+flagdelete=exist
[delete_exist_field_children]
-fieldname=Children
-fieldval=child
-flagdelete=exist
+fieldname=Children
+fieldval=child
+flagdelete=exist
[delete_exist_field_class]
-fieldname=Class
-fieldval=Private
-flagdelete=exist
+fieldname=Class
+fieldval=Private
+flagdelete=exist
[delete_exist_field_dept]
-fieldname=Department
-fieldval=Symbian
-flagdelete=exist
+fieldname=Department
+fieldval=Symbian
+flagdelete=exist
[multiple_contact_add_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-flag=multiple
-noofCI=25
+fieldname=Assistant
+fieldval=Srikanth
+flag=multiple
+noofCI=25
[multiple_contact_add_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-flag=multiple
-noofCI=25
+fieldname=Assistant-Tel
+fieldval=23456
+flag=multiple
+noofCI=25
[multiple_contact_add_field_anni]
-fieldname=Anniversary
-flag=multiple
-year=1974
-month=8
-day=6
-noofCI=25
+fieldname=Anniversary
+flag=multiple
+year=1974
+month=8
+day=6
+noofCI=25
[multiple_contact_add_field_spouse]
-fieldname=Spouse
-fieldval=wife
-flag=multiple
-noofCI=25
+fieldname=Spouse
+fieldval=wife
+flag=multiple
+noofCI=25
[multiple_contact_add_field_children]
-fieldname=Children
-fieldval=child
-flag=multiple
-noofCI=25
+fieldname=Children
+fieldval=child
+flag=multiple
+noofCI=25
[multiple_contact_add_field_class]
-fieldname=Class
-fieldval=Private
-flag=multiple
-noofCI=25
+fieldname=Class
+fieldval=Private
+flag=multiple
+noofCI=25
[multiple_contact_add_field_dept]
-fieldname=Department
-fieldval=Symbian
-flag=multiple
-noofCI=25
+fieldname=Department
+fieldval=Symbian
+flag=multiple
+noofCI=25
[multiple_contact_update_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-updatedvalue=sougata
-noofCI=25
+fieldname=Assistant
+fieldval=Srikanth
+updatedvalue=sougata
+noofCI=25
[multiple_contact_update_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-updatedvalue=2345622
-noofCI=25
+fieldname=Assistant-Tel
+fieldval=23456
+updatedvalue=2345622
+noofCI=25
[multiple_contact_update_field_anni]
-fieldname=Anniversary
-year=1974
-month=8
-day=6
-updateyear=1977
-updatemonth=1
-updateday=24
-noofCI=25
+fieldname=Anniversary
+year=1974
+month=8
+day=6
+updateyear=1977
+updatemonth=1
+updateday=24
+noofCI=25
[multiple_contact_update_field_spouse]
-fieldname=Spouse
-fieldval=wife
-updatedvalue=hello
-noofCI=25
+fieldname=Spouse
+fieldval=wife
+updatedvalue=hello
+noofCI=25
[multiple_contact_update_field_children]
-fieldname=Children
-fieldval=child
-updatedvalue=cccc
-noofCI=25
+fieldname=Children
+fieldval=child
+updatedvalue=cccc
+noofCI=25
[multiple_contact_update_field_class]
-fieldname=Class
-fieldval=Private
-updatedvalue=Public
-noofCI=25
+fieldname=Class
+fieldval=Private
+updatedvalue=Public
+noofCI=25
[multiple_contact_update_field_dept]
-fieldname=Department
-fieldval=Symbian
-updatedvalue=Finance
-noofCI=25
+fieldname=Department
+fieldval=Symbian
+updatedvalue=Finance
+noofCI=25
[multiple_contact_delete_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-noofCI=25
+fieldname=Assistant
+fieldval=Srikanth
+noofCI=25
[multiple_contact_delete_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-noofCI=25
+fieldname=Assistant-Tel
+fieldval=23456
+noofCI=25
[multiple_contact_delete_field_anni]
-fieldname=Anniversary
-year=1976
-month=8
-day=6
-noofCI=25
+fieldname=Anniversary
+year=1976
+month=8
+day=6
+noofCI=25
[multiple_contact_delete_field_spouse]
-fieldname=Spouse
-fieldval=wife
-noofCI=25
+fieldname=Spouse
+fieldval=wife
+noofCI=25
[multiple_contact_delete_field_children]
-fieldname=Children
-fieldval=child
-noofCI=25
+fieldname=Children
+fieldval=child
+noofCI=25
[multiple_contact_delete_field_class]
-fieldname=Class
-fieldval=Private
-noofCI=25
+fieldname=Class
+fieldval=Private
+noofCI=25
[multiple_contact_delete_field_dept]
-fieldname=Department
-fieldval=Symbian
-noofCI=25
+fieldname=Department
+fieldval=Symbian
+noofCI=25
[performance_add_all_fields]
-asstfieldval=Srikanth
-assttelfieldval=23456
-spousefieldval=wife
-childrenfieldval=child
-classfieldval=Private
-deptfieldval=Symbian
-year=1975
-month=8
-day=7
-noofCI=25
+asstfieldval=Srikanth
+assttelfieldval=23456
+spousefieldval=wife
+childrenfieldval=child
+classfieldval=Private
+deptfieldval=Symbian
+year=1975
+month=8
+day=7
+noofCI=25
[performance_update_all_fields]
-updatedvalue=general
-flag=update
-asstfieldval=Srikanth
-assttelfieldval=23456
-spousefieldval=wife
-childrenfieldval=child
-classfieldval=Private
-deptfieldval=Symbian
-year=1975
-month=8
-day=7
-updateyear=1977
-updatemonth=1
-updateday=24
-noofCI=25
+updatedvalue=general
+flag=update
+asstfieldval=Srikanth
+assttelfieldval=23456
+spousefieldval=wife
+childrenfieldval=child
+classfieldval=Private
+deptfieldval=Symbian
+year=1975
+month=8
+day=7
+updateyear=1977
+updatemonth=1
+updateday=24
+noofCI=25
[performance_delete_all_fields]
-flag=delete
-asstfieldval=Srikanth
-assttelfieldval=23456
-spousefieldval=wife
-childrenfieldval=child
-classfieldval=Private
-deptfieldval=Symbian
-year=1975
-month=8
-day=7
-noofCI=25
+flag=delete
+asstfieldval=Srikanth
+assttelfieldval=23456
+spousefieldval=wife
+childrenfieldval=child
+classfieldval=Private
+deptfieldval=Symbian
+year=1975
+month=8
+day=7
+noofCI=25
[template_add_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-flag=template
+fieldname=Assistant
+fieldval=Srikanth
+flag=template
[template_add_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-flag=template
+fieldname=Assistant-Tel
+fieldval=23456
+flag=template
[template_add_field_anni]
-fieldname=Anniversary
-flag=template
-year=1974
-month=8
-day=6
+fieldname=Anniversary
+flag=template
+year=1974
+month=8
+day=6
[template_add_field_spouse]
-fieldname=Spouse
-fieldval=wife
-flag=template
+fieldname=Spouse
+fieldval=wife
+flag=template
[template_add_field_children]
-fieldname=Children
-fieldval=child
-flag=template
+fieldname=Children
+fieldval=child
+flag=template
[template_add_field_class]
-fieldname=Class
-fieldval=Private
-flag=template
+fieldname=Class
+fieldval=Private
+flag=template
[template_add_field_dept]
-fieldname=Department
-fieldval=Symbian
-flag=template
+fieldname=Department
+fieldval=Symbian
+flag=template
[add_field_blank_asst]
-fieldname=Assistant
-fieldval=
-flag=template
+fieldname=Assistant
+fieldval=
+flag=template
[add_field_blank_asst-tel]
-fieldname=Assistant-Tel
-fieldval=
-flag=template
+fieldname=Assistant-Tel
+fieldval=
+flag=template
[add_field_zero_anni]
-fieldname=Anniversary
-flag=template
-year=0
-month=0
-day=0
+fieldname=Anniversary
+flag=template
+year=0
+month=0
+day=0
[add_field_blank_spouse]
-fieldname=Spouse
-fieldval=
-flag=template
+fieldname=Spouse
+fieldval=
+flag=template
[add_field_blank_children]
-fieldname=Children
-fieldval=
-flag=template
+fieldname=Children
+fieldval=
+flag=template
[add_field_blank_class]
-fieldname=Class
-fieldval=
-flag=template
+fieldname=Class
+fieldval=
+flag=template
[add_field_blank_dept]
-fieldname=Department
-fieldval=
-flag=template
+fieldname=Department
+fieldval=
+flag=template
[template_update_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-updatedvalue=sougata
-flag=template
+fieldname=Assistant
+fieldval=Srikanth
+updatedvalue=sougata
+flag=template
[template_update_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-updatedvalue=2345634
-flag=template
+fieldname=Assistant-Tel
+fieldval=23456
+updatedvalue=2345634
+flag=template
[template_update_field_anni]
-fieldname=Anniversary
-flag=template
-year=1974
-month=8
-day=6
-updateyear=1977
-updatemonth=1
-updateday=24
+fieldname=Anniversary
+flag=template
+year=1974
+month=8
+day=6
+updateyear=1977
+updatemonth=1
+updateday=24
[template_update_field_spouse]
-fieldname=Spouse
-fieldval=wife
-updatedvalue=hello
-flag=template
+fieldname=Spouse
+fieldval=wife
+updatedvalue=hello
+flag=template
[template_update_field_children]
-fieldname=Children
-fieldval=child
-updatedvalue=cccc
-flag=template
+fieldname=Children
+fieldval=child
+updatedvalue=cccc
+flag=template
[template_update_field_class]
-fieldname=Class
-fieldval=Private
-updatedvalue=Public
-flag=template
+fieldname=Class
+fieldval=Private
+updatedvalue=Public
+flag=template
[template_update_field_dept]
-fieldname=Department
-fieldval=Symbian
-updatedvalue=Finance
-flag=template
+fieldname=Department
+fieldval=Symbian
+updatedvalue=Finance
+flag=template
[template_delete_field_asst]
-fieldname=Assistant
-fieldval=Srikanth
-flag=template
+fieldname=Assistant
+fieldval=Srikanth
+flag=template
[template_delete_field_asst-tel]
-fieldname=Assistant-Tel
-fieldval=23456
-flag=template
+fieldname=Assistant-Tel
+fieldval=23456
+flag=template
[template_delete_field_anni]
-fieldname=Anniversary
-fieldval=
-flag=template
-year=1974
-month=8
-day=6
+fieldname=Anniversary
+fieldval=
+flag=template
+year=1974
+month=8
+day=6
[template_delete_field_spouse]
-fieldname=Spouse
-fieldval=wife
-flag=template
+fieldname=Spouse
+fieldval=wife
+flag=template
[template_delete_field_children]
-fieldname=Children
-fieldval=child
-flag=template
+fieldname=Children
+fieldval=child
+flag=template
[template_delete_field_class]
-fieldname=Class
-fieldval=Private
-flag=template
+fieldname=Class
+fieldval=Private
+flag=template
[template_delete_field_dept]
-fieldname=Department
-fieldval=Symbian
-flag=template
+fieldname=Department
+fieldval=Symbian
+flag=template
Binary file phonebookengines_old/contactsmodel/tsrc/Integration/TestContactSuite/scripts/Script File Generator.xls has changed
--- a/phonebookengines_old/contactsmodel/tsrc/Integration/TestImpExvCard/scripts/ImportExportTestCases.ini Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/Integration/TestImpExvCard/scripts/ImportExportTestCases.ini Wed Jul 21 11:09:07 2010 +0300
@@ -1,402 +1,402 @@
[export_field_asst_with_data]
-fieldname=Assistant
-fieldval=Srikanth
+fieldname=Assistant
+fieldval=Srikanth
[export_field_asst-tel_with_data]
-fieldname=Assistant-Tel
-fieldval=234567
+fieldname=Assistant-Tel
+fieldval=234567
[export_field_anni_with_data]
-fieldname=Anniversary
-year=1974
-month=08
-day=06
+fieldname=Anniversary
+year=1974
+month=08
+day=06
[export_field_spouse_with_data]
-fieldname=Spouse
-fieldval=Mamta
+fieldname=Spouse
+fieldval=Mamta
[export_field_children_with_data]
-fieldname=Children
-fieldval=child
+fieldname=Children
+fieldval=child
[export_field_class_with_data]
-fieldname=Class
-fieldval=Private
+fieldname=Class
+fieldval=Private
[export_field_company_with_data]
-fieldname=CompanyName
-fieldval=Symbian
+fieldname=CompanyName
+fieldval=Symbian
[export_field_dept_with_data]
-fieldname=Department
-fieldval=PTD,PIM
+fieldname=Department
+fieldval=PTD,PIM
[export_field_asst_without_data]
-fieldname=Assistant
-fieldval=
-flag=without
+fieldname=Assistant
+fieldval=
+flag=without
[export_field_asst-tel_without_data]
-fieldname=Assistant-Tel
-fieldval=
-flag=without
+fieldname=Assistant-Tel
+fieldval=
+flag=without
[export_field_anni_without_data]
-fieldname=Anniversary
-flag=without
-year=0
-month=0
-day=0
+fieldname=Anniversary
+flag=without
+year=0
+month=0
+day=0
[export_field_spouse_without_data]
-fieldname=Spouse
-fieldval=
-flag=without
+fieldname=Spouse
+fieldval=
+flag=without
[export_field_children_without_data]
-fieldname=Children
-fieldval=
-flag=without
+fieldname=Children
+fieldval=
+flag=without
[export_field_class_without_data]
-fieldname=Class
-fieldval=
-flag=without
+fieldname=Class
+fieldval=
+flag=without
[export_field_company_without_data]
-fieldname=CompanyName
-fieldval=
-flag=without
+fieldname=CompanyName
+fieldval=
+flag=without
[export_field_dept_without_data]
-fieldname=Department
-fieldval=
-flag=without
+fieldname=Department
+fieldval=
+flag=without
[export_all_fields1_with_data]
-companyfieldval=Symbian
-flag=all
-asstfieldval=Sougata
-assttelfieldval=26741234
-spousefieldval=spouse
-childrenfieldval=babies
-classfieldval=Public
-deptfieldval=PTD,PIM
-year=1977
-month=1
-day=24
+companyfieldval=Symbian
+flag=all
+asstfieldval=Sougata
+assttelfieldval=26741234
+spousefieldval=spouse
+childrenfieldval=babies
+classfieldval=Public
+deptfieldval=PTD,PIM
+year=1977
+month=1
+day=24
[export_all_fields2_with_data]
-companyfieldval=
-flag=all
-asstfieldval=Sougata
-assttelfieldval=26741234
-spousefieldval=spouse
-childrenfieldval=babies
-classfieldval=Public
-deptfieldval=PTD,PIM
-year=1977
-month=1
-day=24
-flagexport=3
+companyfieldval=
+flag=all
+asstfieldval=Sougata
+assttelfieldval=26741234
+spousefieldval=spouse
+childrenfieldval=babies
+classfieldval=Public
+deptfieldval=PTD,PIM
+year=1977
+month=1
+day=24
+flagexport=3
[export_all_fields3_with_data]
-companyfieldval=Symbian
-flag=all
-asstfieldval=Sougata
-assttelfieldval=26741234
-spousefieldval=spouse
-childrenfieldval=babies
-classfieldval=Public
-deptfieldval=
-year=1977
-month=1
-day=24
-flagexport=2
+companyfieldval=Symbian
+flag=all
+asstfieldval=Sougata
+assttelfieldval=26741234
+spousefieldval=spouse
+childrenfieldval=babies
+classfieldval=Public
+deptfieldval=
+year=1977
+month=1
+day=24
+flagexport=2
[export_all_fields_without_data]
-companyfieldval=
-flag=all
-asstfieldval=
-assttelfieldval=
-spousefieldval=
-childrenfieldval=
-classfieldval=
-deptfieldval=
-year=0
-month=0
-day=0
-flagexport=1
+companyfieldval=
+flag=all
+asstfieldval=
+assttelfieldval=
+spousefieldval=
+childrenfieldval=
+classfieldval=
+deptfieldval=
+year=0
+month=0
+day=0
+flagexport=1
[import_field_asst_insert_mode]
-fieldname=Assistant
-expecteddata=Srikanth
+fieldname=Assistant
+expecteddata=Srikanth
[import_field_asst-tel_insert_mode]
-fieldname=Assistant-Tel
-expecteddata=234567
+fieldname=Assistant-Tel
+expecteddata=234567
[import_field_anni_insert_mode]
-fieldname=Anniversary
-year=1974
-month=08
-day=06
+fieldname=Anniversary
+year=1974
+month=08
+day=06
[import_field_spouse_insert_mode]
-fieldname=Spouse
-expecteddata=Mamta
+fieldname=Spouse
+expecteddata=Mamta
[import_field_children_insert_mode]
-fieldname=Children
-expecteddata=child
+fieldname=Children
+expecteddata=child
[import_field_class_insert_mode]
-fieldname=Class
-expecteddata=Private
+fieldname=Class
+expecteddata=Private
[import_field_company_insert_mode]
-fieldname=CompanyName
-expecteddata=Symbian
+fieldname=CompanyName
+expecteddata=Symbian
[import_field_dept_insert_mode]
-fieldname=Department
-expecteddata=PTD,PIM
+fieldname=Department
+expecteddata=PTD,PIM
[import_field_asst_corrupt]
-fieldname=Assistant
-flag=1
-expecteddata=@$%^%xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxvenkatesh
+fieldname=Assistant
+flag=1
+expecteddata=@$%^%xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxvenkatesh
[import_field_asst-tel_corrupt]
-fieldname=Assistant-Tel
-flag=1
-expecteddata=ass334345111#25%^33333333333333333131317879)
+fieldname=Assistant-Tel
+flag=1
+expecteddata=ass334345111#25%^33333333333333333131317879)
[import_field_spouse_corrupt]
-fieldname=Spouse
-flag=1
-expecteddata=Mamtaweweiwretrwqurower9%#weweuwrtwruworkwmfrwe
+fieldname=Spouse
+flag=1
+expecteddata=Mamtaweweiwretrwqurower9%#weweuwrtwruworkwmfrwe
[import_field_children_corrupt]
-fieldname=Children
-flag=1
-expecteddata=childwerrtyuerytetrergsgewrwyreuijggeieigekjegkjekjgr
+fieldname=Children
+flag=1
+expecteddata=childwerrtyuerytetrergsgewrwyreuijggeieigekjegkjekjgr
[import_field_class_corrupt]
-fieldname=Class
-flag=1
-expecteddata=Privatexdsewrwtytsxcartstsyurtioorrtcbccnc
+fieldname=Class
+flag=1
+expecteddata=Privatexdsewrwtytsxcartstsyurtioorrtcbccnc
[import_field_company_corrupt]
-fieldname=CompanyName
-flag=1
-expecteddata=Symbian12344ererttuwsfdfhgertyyyuiuioopopo
+fieldname=CompanyName
+flag=1
+expecteddata=Symbian12344ererttuwsfdfhgertyyyuiuioopopo
[import_field_dept_insert_corrupt]
-fieldname=Department
-flag=1
-expecteddata=PTD,PIMXxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+fieldname=Department
+flag=1
+expecteddata=PTD,PIMXxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
[import_all_fields1_insert_mode]
-companyfieldval=Symbian
-flag=all
-asstfieldval=Sougata
-assttelfieldval=26741234
-spousefieldval=spouse
-childrenfieldval=babies
-classfieldval=Public
-deptfieldval=PTD,PIM
-year=1977
-month=1
-day=24
+companyfieldval=Symbian
+flag=all
+asstfieldval=Sougata
+assttelfieldval=26741234
+spousefieldval=spouse
+childrenfieldval=babies
+classfieldval=Public
+deptfieldval=PTD,PIM
+year=1977
+month=1
+day=24
[import_all_fields2_insert_mode]
-companyfieldval=
-flag=all
-asstfieldval=Sougata
-assttelfieldval=26741234
-spousefieldval=spouse
-childrenfieldval=babies
-classfieldval=Public
-deptfieldval=PTD,PIM
-year=1977
-month=1
-day=24
-flagexport=3
+companyfieldval=
+flag=all
+asstfieldval=Sougata
+assttelfieldval=26741234
+spousefieldval=spouse
+childrenfieldval=babies
+classfieldval=Public
+deptfieldval=PTD,PIM
+year=1977
+month=1
+day=24
+flagexport=3
[import_all_fields3_insert_mode]
-companyfieldval=Symbian
-flag=all
-asstfieldval=Sougata
-assttelfieldval=26741234
-spousefieldval=spouse
-childrenfieldval=babies
-classfieldval=Public
-deptfieldval=
-year=1977
-month=1
-day=24
-flagexport=2
+companyfieldval=Symbian
+flag=all
+asstfieldval=Sougata
+assttelfieldval=26741234
+spousefieldval=spouse
+childrenfieldval=babies
+classfieldval=Public
+deptfieldval=
+year=1977
+month=1
+day=24
+flagexport=2
[export_field_asst_with_new_data]
-fieldname=Assistant
-fieldval=Venkatesh
-flag=new
+fieldname=Assistant
+fieldval=Venkatesh
+flag=new
[export_field_asst-tel_with_new_data]
-fieldname=Assistant-Tel
-fieldval=984553722
-flag=new
+fieldname=Assistant-Tel
+fieldval=984553722
+flag=new
[export_field_anni_with_new_data]
-fieldname=Anniversary
-flag=new
-year=2005
-month=00
-day=30
+fieldname=Anniversary
+flag=new
+year=2005
+month=00
+day=30
[export_field_spouse_with_new_data]
-fieldname=Spouse
-fieldval=Vani
-flag=new
+fieldname=Spouse
+fieldval=Vani
+flag=new
[export_field_children_with_new_data]
-fieldname=Children
-fieldval=child1
-flag=new
+fieldname=Children
+fieldval=child1
+flag=new
[export_field_class_with_new_data]
-fieldname=Class
-fieldval=Protected
-flag=new
+fieldname=Class
+fieldval=Protected
+flag=new
[export_field_company_with_new_data]
-fieldname=CompanyName
-fieldval=Mphasis
-flag=new
+fieldname=CompanyName
+fieldval=Mphasis
+flag=new
[export_field_dept_with_new_data]
-fieldname=Department
-fieldval=PTD,DP
-flag=new
+fieldname=Department
+fieldval=PTD,DP
+flag=new
[import_field_asst_merge_mode1]
-fieldname=Assistant
-flag=1
-expecteddata=Venkatesh
+fieldname=Assistant
+flag=1
+expecteddata=Venkatesh
[import_field_asst-tel_merge_mode1]
-fieldname=Assistant-Tel
-flag=1
-expecteddata=984553722
+fieldname=Assistant-Tel
+flag=1
+expecteddata=984553722
[import_field_anni_merge_mode1]
-fieldname=Anniversary
-flag=1
-year=2005
-month=0
-day=30
+fieldname=Anniversary
+flag=1
+year=2005
+month=0
+day=30
[import_field_spouse_merge_mode1]
-fieldname=Spouse
-flag=1
-expecteddata=Vani
+fieldname=Spouse
+flag=1
+expecteddata=Vani
[import_field_children_merge_mode1]
-fieldname=Children
-flag=1
-expecteddata=child1
+fieldname=Children
+flag=1
+expecteddata=child1
[import_field_class_merge_mode1]
-fieldname=Class
-flag=1
-expecteddata=Protected
+fieldname=Class
+flag=1
+expecteddata=Protected
[import_field_company_merge_mode1]
-fieldname=CompanyName
-flag=1
-expecteddata=Mphasis
+fieldname=CompanyName
+flag=1
+expecteddata=Mphasis
[import_field_dept_merge_mode1]
-fieldname=Department
-flag=1
-expecteddata=PTD,DP
+fieldname=Department
+flag=1
+expecteddata=PTD,DP
[import_field_asst_merge_mode2]
-fieldname=Assistant
-flag=2
-expecteddata=Venkatesh
+fieldname=Assistant
+flag=2
+expecteddata=Venkatesh
[import_field_asst-tel_merge_mode2]
-fieldname=Assistant-Tel
-flag=2
-expecteddata=984553722
+fieldname=Assistant-Tel
+flag=2
+expecteddata=984553722
[import_field_anni_merge_mode2]
-fieldname=Anniversary
-flag=2
-year=2005
-month=0
-day=30
+fieldname=Anniversary
+flag=2
+year=2005
+month=0
+day=30
[import_field_spouse_merge_mode2]
-fieldname=Spouse
-flag=2
-expecteddata=Vani
+fieldname=Spouse
+flag=2
+expecteddata=Vani
[import_field_children_merge_mode2]
-fieldname=Children
-flag=2
-expecteddata=child1
+fieldname=Children
+flag=2
+expecteddata=child1
[import_field_class_merge_mode2]
-fieldname=Class
-flag=2
-expecteddata=Protected
+fieldname=Class
+flag=2
+expecteddata=Protected
[import_field_company_merge_mode2]
-fieldname=CompanyName
-flag=2
-expecteddata=Mphasis
+fieldname=CompanyName
+flag=2
+expecteddata=Mphasis
[import_field_dept_merge_mode2]
-fieldname=Department
-flag=2
-expecteddata=PTD,DP
+fieldname=Department
+flag=2
+expecteddata=PTD,DP
[import_field_asst_merge_mode3]
-fieldname=Assistant
-flag=3
+fieldname=Assistant
+flag=3
[import_field_asst-tel_merge_mode3]
-fieldname=Assistant-Tel
-flag=3
+fieldname=Assistant-Tel
+flag=3
[import_field_anni_merge_mode3]
-fieldname=Anniversary
-flag=3
-year=1974
-month=8
-day=6
+fieldname=Anniversary
+flag=3
+year=1974
+month=8
+day=6
[import_field_spouse_merge_mode3]
-fieldname=Spouse
-flag=3
+fieldname=Spouse
+flag=3
[import_field_children_merge_mode3]
-fieldname=Children
-flag=3
+fieldname=Children
+flag=3
[import_field_class_merge_mode3]
-fieldname=Class
-flag=3
+fieldname=Class
+flag=3
[import_field_company_merge_mode3]
-fieldname=CompanyName
-flag=3
+fieldname=CompanyName
+flag=3
[import_field_dept_merge_mode3]
-fieldname=Department
-flag=3
+fieldname=Department
+flag=3
--- a/phonebookengines_old/contactsmodel/tsrc/Integration/TestImpExvCard/scripts/TestImpExvCard.script Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/Integration/TestImpExvCard/scripts/TestImpExvCard.script Wed Jul 21 11:09:07 2010 +0300
@@ -18,7 +18,7 @@
//
LOAD_SUITE TestImpExvCardSuite
//
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0003
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0003
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0003
//! @SYMTestType Component Test
@@ -30,10 +30,10 @@
//! @SYMTestActions A VCard with REV property in local time format and a TZ property present is imported to a Contact database using the CntModel converter
//! @SYMTestExpectedResults The imported contact entry has LastModified() equal to the VCard's REV property after beign adjusted by the TZ property
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpRevLocalTZ c:\CITExImvCard\testdata\ImportREVLocalTZ\ExpectedUTC.ini
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0003
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0003
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0002
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0002
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0002
//! @SYMTestType Component Test
@@ -45,10 +45,10 @@
//! @SYMTestActions A VCard with REV property in local time format is imported to a Contact database using the Cnt Model converter
//! @SYMTestExpectedResults The imported contact entry has LastModified() equal to the VCard's REV property. The Vcard's REV property is converted to UTC time with offset=0
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpRevLocal c:\CITExImvCard\testdata\ImportREVLocal\ExpectedUTC.ini
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0002
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0002
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0004
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0004
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0004
//! @SYMTestType Component Test
@@ -60,10 +60,10 @@
//! @SYMTestActions A VCard with no REV property is imported to a Contact database using the CntModel converter
//! @SYMTestExpectedResults The imported contact entry has LastModified() equal to NULL
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpNoRev
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0004
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0004
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0001
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0001
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0001
//! @SYMTestType Component Test
@@ -75,10 +75,10 @@
//! @SYMTestActions A VCard with REV property in UTC format is imported to a Contact database using the Cnt Model converter
//! @SYMTestExpectedResults The imported contact entry has LastModified() equal to the VCard's REV property
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpRevUTC c:\CITExImvCard\testdata\ImportRevUTC\ExpectedUTC.ini
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0002
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0002
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0005
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0005
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0005
//! @SYMTestType Component Test
@@ -90,10 +90,10 @@
//! @SYMTestActions A Vcard with BDAY property is imported to a Contact database using the Cnt Model converter.
//! @SYMTestExpectedResults The imported contact entry has the birthday field equal to the VCards BDAY property. No adjustement is made for UTC Offset.
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpBDay c:\CITExImvCard\testdata\ImportBDay\ExpectedBDAY.ini
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0005
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0005
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0006
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0006
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0006
//! @SYMTestType Component Test
@@ -105,10 +105,10 @@
//! @SYMTestActions A Vcard with no BDAY property is imported to a Contact database using the Cnt Model converter.
//! @SYMTestExpectedResults The imported contact entry has the birthday field equal to TDateTime::Null
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpNoBDay
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0006
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0006
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0007
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0007
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0007
//! @SYMTestType Component Test
@@ -120,10 +120,10 @@
//! @SYMTestActions A Contact database is exported to VCards using the CntModel converter
//! @SYMTestExpectedResults The exported VCard's REV property is set to UTC value, and is equal to the contact entry's LastModified() value.
RUN_TEST_STEP 100 TestImpExvCardSuite TestExRevUTC
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0007
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0007
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0008
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0008
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0008
//! @SYMTestType Component Test
@@ -135,10 +135,10 @@
//! @SYMTestActions A VCard with BDAY property is exported from a Contact database using the CntModel converter.
//! @SYMTestExpectedResults The exported VCard's BDAY property is equal to the contact entry's birthday field, and is in Local Time format.
RUN_TEST_STEP 100 TestImpExvCardSuite TestExBDayLocal c:\CITExImvCard\testdata\ExportBDayLocal\ExportBDayLocal.ini
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0008
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0008
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0009
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0009
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0009
//! @SYMTestType Component Test
@@ -150,10 +150,10 @@
//! @SYMTestActions A VCard with no BDAY property is exported from a Contact database using the CntModel converter.
//! @SYMTestExpectedResults The exported VCard's BDAY property is equal to TDateTime::Null
RUN_TEST_STEP 100 TestImpExvCardSuite TestExNoBDay
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0009
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0009
-START_TESTCASE PIM-CIT-Cntmodel-234AP-0010
+START_TESTCASE PIM-CIT-Cntmodel-234AP-0010
//! @SYMTestCaseID PIM-CIT-Cntmodel-234AP-0010
//! @SYMTestType Component Test
@@ -165,7 +165,7 @@
//! @SYMTestActions A Vcard is imported in an OOM loop.
//! @SYMTestExpectedResults Contacts Import must be successful
RUN_TEST_STEP 100 TestImpExvCardSuite TestImpOOM
-END_TESTCASE PIM-CIT-Cntmodel-234AP-0010
+END_TESTCASE PIM-CIT-Cntmodel-234AP-0010
PRINT Complate_TestImpExvCard_Tests
--- a/phonebookengines_old/contactsmodel/tsrc/TVCARD.CPP Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/TVCARD.CPP Wed Jul 21 11:09:07 2010 +0300
@@ -12,215 +12,215 @@
//
// Description:
//
-
-#if !defined(__T_VERS_H__)
- #include "T_VERS.H"
-#endif
-
-void CVCardTest::GetSampleVersitL()
- {
-
- iParser=CParserVCard::NewL();
- iVersit.Zero();
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(_L8("BEGIN:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;HOME:+44-7700-900-000"));
- iVersit.Append(KVersitTokenCRLF);
-//QUOTED-P
- iVersit.Append(_L8("NOTE;ENCODING=QUOTED-PRINTABLE:Don’t remember to order Girl="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" Scout cookies from Stacey today!"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("A.TEL;HOME:+44-7700-900-001"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("A.NOTE:This is my vacation home."));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("PHOTO:http://www.abc.com/dir_photos/my_photo.gif"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("SOUND;VALUE=CONTENT-ID:<jsmith.part3.960817T083000.xyzMail@examlehost1.com"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("FN;CHARSET=ISO-8859-8;VALUE=URL;TYPE=GIF:Mr. John Q. Public, Esq."));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("N:Public;John;Quinlan;Mr.;Esq."));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("N:Veni, Vidi, Vici The Restaurant."));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("PHOTO;VALUE=URL:file:///jqpublic.gif"));
- iVersit.Append(KVersitTokenCRLF);
-//BASE 64
- iVersit.Append(_L8("PHOTO;ENCODING=BASE64;TYPE=GIF:R0lGODdhfgA4AOYAAAAAAK+vr62trVIxa6WlpZ+fnzEpCEpzlAha/0Kc74+PjyGMSuecKRhrtX9/fzExORBSjCEYCGtra2NjYyF7nDGE50JrhAg51qWtOTl7vee1MWu150o5e3PO/3sxcwAx/4R7GBgQOcDAwFoAQt61hJyMGHuUSpRKIf8A/wAY54yMjHtz"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(KVersitTokenCRLF); //BASE 64 (needs double CRLF)
- iVersit.Append(_L8("BDAY:19950415"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("BDAY:1995-04-15"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("ADR;DOM;HOME:P.O. Box 1;Suite 1;Example Main Street;Any Town;Exampleshire;ZZ99 EXP;"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("ADR;DOM;WORK;HOME;POSTAL:P.O. Box 1;;;Example Town;Exampleshire;ZZ99 EXP;"));
- iVersit.Append(KVersitTokenCRLF);
-//QUOTED-P
- iVersit.Append(_L8("LABEL;DOM;POSTAL;ENCODING=QUOTED-PRINTABLE:P. O. Box 456=0D=0A="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("1 Example Road=0D=0A="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("Any Town, Exampleshire ZZ99 EXP"));
- iVersit.Append(KVersitTokenCRLF);
- /*iVersit.Append(_L8("LABEL;INTL;PARCEL,ENCODING=QUOTED-PRINTABLE:Suite 101=0D=0A="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("1 Example Street=0D=0A="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("Any Town, Exampleshire;ZZ99 EXP=0D=0A="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("U.S.A."));
- iVersit.Append(KVersitTokenCRLF);*/
- iVersit.Append(_L8("TEL;PREF;WORK;MSG;FAX:+44-7700-900-124"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;WORK;HOME;VOICE;FAX:+44-7700-900-123"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("EMAIL;INTERNET:name.example@symbianfoundation.test"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("MAILER:ccMail 2.2"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TZ:-0500"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TZ:-08:00"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("GEO:37.24,-17.87"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TITLE:V.P., Research and Development"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("ROLE:Executive"));
- iVersit.Append(KVersitTokenCRLF);
-//BASE 64
- /*iVersit.Append(_L8("LOGO;ENCODING=BASE64;TYPE=GIF:R0lGODdhfgA4AOYAAAAAAK+vr62trVIxa6WlpZ+fnzEpCEpzlAha/0Kc74+PjyGMSuecKRhrtX9/fzExORBSjCEYCGtra2NjYyF7nDGE50JrhAg51qWtOTl7vee1MWu150o5e3PO/3sxcwAx/4R7GBgQOcDAwFoAQt61hJyMGHuUSpRKIf8A/wAY54yMjHtz..."));
- iVersit.Append(KVersitTokenCRLF); */
-
-//AGENT
- iVersit.Append(_L8("AGENT:"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("BEGIN:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("N:Friday;Fred"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;WORK;VOICE:+44-7700-900-009"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;WORK;FAX:+44-7700-900-067"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("UID:0-555-1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("END:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
-
- iVersit.Append(_L8("ORG:ABC, Inc.;Example State Division;Marketing"));
- iVersit.Append(KVersitTokenCRLF);
-
-//QUOTED-P
- iVersit.Append(_L8("NOTE;ENCODING=QUOTED-PRINTABLE:This facsimile machine if operational="));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("0830 to 1715 hours"));
- iVersit.Append(KVersitTokenCRLF);
-
- iVersit.Append(_L8("REV:19951031T222710"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("REV:1995-10-31T22:27:10Z"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("SOUND:JON Q PUBLIK"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("SOUND;VALUE=URL:file///multimed/audio/jqpublic.wav"));
- iVersit.Append(KVersitTokenCRLF);
-// BASE 64
- /*iVersit.Append(_L8("SOUND;WAVE;BASE64:UklGRhAsAABXQVZFZm10IBAAAAABAAEAESsAABErAAABAAgAZGF0YesrAACAg4eCeXR4e3uAhoiIiYmKjIiDfnx5eX6CgoKEhYWDenV5fH6BhISGiIiDfHZ2eXt/hIiKjY2IhH12d3Vyc3uDiIiFf3l7fn18eXl+houFf319fnyAgHl5eoCIiISChIeAfnt2..."));*/
- iVersit.Append(_L8("URL:http://abc.com/pub/directory/northam/jpublic.ecd"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("X-ABC-VIDEO;MPEG2:http://lonestar.bubbas.org/billibob.mpg"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("X-DL;X-DesignWorkGroup:List Item 1;List Item 2;List Item 3"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("END:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("BEGIN:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("N:A;B;C;;."));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL:1111"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("END:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- }
-
-void CVCardTest::GetSampleVersit2L(TInt aContactId)
- {
- // this will delete the agent
- iVersit.Zero();
- iParser=CParserVCard::NewL();
- iVersit.Append(_L8("BEGIN:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- TBuf<32> buf;
- buf.Format(_L("UID:0-555-%d"),aContactId);
- iVersit.Append(buf);
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("END:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- }
-
-void CVCardTest::GetSampleVersit3L()
- {
- iParser=CParserVCard::NewL();
- iVersit.Zero();
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(_L8("BEGIN:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;HOME:+44-7700-900-006"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("A.NOTE:This is my vacation home."));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("PHOTO:http://www.abc.com/dir_photos/my_photo.gif"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("END:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
-//
- iVersit.Append(_L8(" "));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("BEGIN:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("VERSION:2.1"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8(" "));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;HOME:+44-7700-900-005"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("TEL;WORK;VOICE:+44-7700-900-006"));
- iVersit.Append(KVersitTokenCRLF);
- iVersit.Append(_L8("END:VCARD"));
- iVersit.Append(KVersitTokenCRLF);
- }
-
+
+#if !defined(__T_VERS_H__)
+ #include "T_VERS.H"
+#endif
+
+void CVCardTest::GetSampleVersitL()
+ {
+
+ iParser=CParserVCard::NewL();
+ iVersit.Zero();
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(_L8("BEGIN:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;HOME:+44-7700-900-000"));
+ iVersit.Append(KVersitTokenCRLF);
+//QUOTED-P
+ iVersit.Append(_L8("NOTE;ENCODING=QUOTED-PRINTABLE:Don’t remember to order Girl="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" Scout cookies from Stacey today!"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("A.TEL;HOME:+44-7700-900-001"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("A.NOTE:This is my vacation home."));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("PHOTO:http://www.abc.com/dir_photos/my_photo.gif"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("SOUND;VALUE=CONTENT-ID:<jsmith.part3.960817T083000.xyzMail@examlehost1.com"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("FN;CHARSET=ISO-8859-8;VALUE=URL;TYPE=GIF:Mr. John Q. Public, Esq."));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("N:Public;John;Quinlan;Mr.;Esq."));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("N:Veni, Vidi, Vici The Restaurant."));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("PHOTO;VALUE=URL:file:///jqpublic.gif"));
+ iVersit.Append(KVersitTokenCRLF);
+//BASE 64
+ iVersit.Append(_L8("PHOTO;ENCODING=BASE64;TYPE=GIF:R0lGODdhfgA4AOYAAAAAAK+vr62trVIxa6WlpZ+fnzEpCEpzlAha/0Kc74+PjyGMSuecKRhrtX9/fzExORBSjCEYCGtra2NjYyF7nDGE50JrhAg51qWtOTl7vee1MWu150o5e3PO/3sxcwAx/4R7GBgQOcDAwFoAQt61hJyMGHuUSpRKIf8A/wAY54yMjHtz"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(KVersitTokenCRLF); //BASE 64 (needs double CRLF)
+ iVersit.Append(_L8("BDAY:19950415"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("BDAY:1995-04-15"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("ADR;DOM;HOME:P.O. Box 1;Suite 1;Example Main Street;Any Town;Exampleshire;ZZ99 EXP;"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("ADR;DOM;WORK;HOME;POSTAL:P.O. Box 1;;;Example Town;Exampleshire;ZZ99 EXP;"));
+ iVersit.Append(KVersitTokenCRLF);
+//QUOTED-P
+ iVersit.Append(_L8("LABEL;DOM;POSTAL;ENCODING=QUOTED-PRINTABLE:P. O. Box 456=0D=0A="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("1 Example Road=0D=0A="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("Any Town, Exampleshire ZZ99 EXP"));
+ iVersit.Append(KVersitTokenCRLF);
+ /*iVersit.Append(_L8("LABEL;INTL;PARCEL,ENCODING=QUOTED-PRINTABLE:Suite 101=0D=0A="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("1 Example Street=0D=0A="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("Any Town, Exampleshire;ZZ99 EXP=0D=0A="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("U.S.A."));
+ iVersit.Append(KVersitTokenCRLF);*/
+ iVersit.Append(_L8("TEL;PREF;WORK;MSG;FAX:+44-7700-900-124"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;WORK;HOME;VOICE;FAX:+44-7700-900-123"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("EMAIL;INTERNET:name.example@symbianfoundation.test"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("MAILER:ccMail 2.2"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TZ:-0500"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TZ:-08:00"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("GEO:37.24,-17.87"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TITLE:V.P., Research and Development"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("ROLE:Executive"));
+ iVersit.Append(KVersitTokenCRLF);
+//BASE 64
+ /*iVersit.Append(_L8("LOGO;ENCODING=BASE64;TYPE=GIF:R0lGODdhfgA4AOYAAAAAAK+vr62trVIxa6WlpZ+fnzEpCEpzlAha/0Kc74+PjyGMSuecKRhrtX9/fzExORBSjCEYCGtra2NjYyF7nDGE50JrhAg51qWtOTl7vee1MWu150o5e3PO/3sxcwAx/4R7GBgQOcDAwFoAQt61hJyMGHuUSpRKIf8A/wAY54yMjHtz..."));
+ iVersit.Append(KVersitTokenCRLF); */
+
+//AGENT
+ iVersit.Append(_L8("AGENT:"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("BEGIN:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("N:Friday;Fred"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;WORK;VOICE:+44-7700-900-009"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;WORK;FAX:+44-7700-900-067"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("UID:0-555-1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("END:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+
+ iVersit.Append(_L8("ORG:ABC, Inc.;Example State Division;Marketing"));
+ iVersit.Append(KVersitTokenCRLF);
+
+//QUOTED-P
+ iVersit.Append(_L8("NOTE;ENCODING=QUOTED-PRINTABLE:This facsimile machine if operational="));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("0830 to 1715 hours"));
+ iVersit.Append(KVersitTokenCRLF);
+
+ iVersit.Append(_L8("REV:19951031T222710"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("REV:1995-10-31T22:27:10Z"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("SOUND:JON Q PUBLIK"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("SOUND;VALUE=URL:file///multimed/audio/jqpublic.wav"));
+ iVersit.Append(KVersitTokenCRLF);
+// BASE 64
+ /*iVersit.Append(_L8("SOUND;WAVE;BASE64:UklGRhAsAABXQVZFZm10IBAAAAABAAEAESsAABErAAABAAgAZGF0YesrAACAg4eCeXR4e3uAhoiIiYmKjIiDfnx5eX6CgoKEhYWDenV5fH6BhISGiIiDfHZ2eXt/hIiKjY2IhH12d3Vyc3uDiIiFf3l7fn18eXl+houFf319fnyAgHl5eoCIiISChIeAfnt2..."));*/
+ iVersit.Append(_L8("URL:http://abc.com/pub/directory/northam/jpublic.ecd"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("X-ABC-VIDEO;MPEG2:http://lonestar.bubbas.org/billibob.mpg"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("X-DL;X-DesignWorkGroup:List Item 1;List Item 2;List Item 3"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("END:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("BEGIN:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("N:A;B;C;;."));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL:1111"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("END:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ }
+
+void CVCardTest::GetSampleVersit2L(TInt aContactId)
+ {
+ // this will delete the agent
+ iVersit.Zero();
+ iParser=CParserVCard::NewL();
+ iVersit.Append(_L8("BEGIN:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ TBuf<32> buf;
+ buf.Format(_L("UID:0-555-%d"),aContactId);
+ iVersit.Append(buf);
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("END:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ }
+
+void CVCardTest::GetSampleVersit3L()
+ {
+ iParser=CParserVCard::NewL();
+ iVersit.Zero();
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(_L8("BEGIN:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;HOME:+44-7700-900-006"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("A.NOTE:This is my vacation home."));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("PHOTO:http://www.abc.com/dir_photos/my_photo.gif"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("END:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+//
+ iVersit.Append(_L8(" "));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("BEGIN:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("VERSION:2.1"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8(" "));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;HOME:+44-7700-900-005"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("TEL;WORK;VOICE:+44-7700-900-006"));
+ iVersit.Append(KVersitTokenCRLF);
+ iVersit.Append(_L8("END:VCARD"));
+ iVersit.Append(KVersitTokenCRLF);
+ }
+
--- a/phonebookengines_old/contactsmodel/tsrc/T_OwnCardDelete.CPP Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/T_OwnCardDelete.CPP Wed Jul 21 11:09:07 2010 +0300
@@ -223,14 +223,14 @@
TRequestStatus status;
aThread.Rendezvous(status);
-
+
User::WaitForRequest(status);
}
LOCAL_D void ThreadFirstTestL(RTest& aTest)
{
- aTest.Next(_L("-- Running worker thread --"));
+ aTest.Next(_L("-- Running worker thread --"));
RMutex mutex;
@@ -308,7 +308,7 @@
LOCAL_D void TestSecondL(RTest& aTest)
{
- aTest.Next(_L("-- Second Owncard Test --"));
+ aTest.Next(_L("-- Second Owncard Test --"));
RMutex mtx;
@@ -381,7 +381,7 @@
LOCAL_D void TestFirstL(RTest& aTest)
{
- aTest.Next(_L("@SYMTestCaseID:PIM-T-OWNCARDDELETE-0001 -- First Owncard Test --"));
+ aTest.Next(_L("@SYMTestCaseID:PIM-T-OWNCARDDELETE-0001 -- First Owncard Test --"));
aTest.Printf(_L("Replacing database \n"));
CContactDatabase* db = CContactDatabase::ReplaceL(KDatabaseFileName);
--- a/phonebookengines_old/contactsmodel/tsrc/asynaccess/src/CntModelTesterAsynch.cpp Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/asynaccess/src/CntModelTesterAsynch.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -495,17 +495,17 @@
// Main.
//
-/**
+/**
-@SYMTestCaseID PIM-CNTMODELTESTERASYNCH-0001
+@SYMTestCaseID PIM-CNTMODELTESTERASYNCH-0001
-*/
+*/
GLDEF_C TInt E32Main()
{
__UHEAP_MARK;
CActiveScheduler* scheduler=new CActiveScheduler;
- test.Start(_L("@SYMTESTCaseID:PIM-CNTMODELTESTERASYNCH-0001 Testing Asynchronously Access"));
+ test.Start(_L("@SYMTESTCaseID:PIM-CNTMODELTESTERASYNCH-0001 Testing Asynchronously Access"));
if (scheduler)
{
--- a/phonebookengines_old/contactsmodel/tsrc/cntmatchlog/group/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Contacts Matching plugin for logeng - test code
-//
-//
-
-PRJ_TESTEXPORTS
-cntmatchtest.iby /epoc32/rom/include/cntmatchtest.iby
-cntmatchtests.bat /epoc32/data/z/system/test/cntmatchtests.bat
-
-PRJ_TESTMMPFILES
-t_logcntmodel.mmp
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/phonebookengines_old/contactsmodel/tsrc/cntmatchlog/group/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,24 @@
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Contacts Matching plugin for logeng - test code
+//
+//
+
+PRJ_TESTEXPORTS
+cntmatchtest.iby /epoc32/rom/include/cntmatchtest.iby
+cntmatchtests.bat /epoc32/data/z/system/test/cntmatchtests.bat
+
+PRJ_TESTMMPFILES
+t_logcntmodel.mmp
+
--- a/phonebookengines_old/contactsmodel/tsrc/t_CaseSensitiveDB.cpp Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/t_CaseSensitiveDB.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -429,16 +429,16 @@
}
-/**
+/**
-@SYMTestCaseID PIM-T-CASESENSITIVEDB-0001
+@SYMTestCaseID PIM-T-CASESENSITIVEDB-0001
-*/
+*/
GLDEF_C TInt E32Main()
{
__UHEAP_MARK;
- TheTest.Start(_L("@SYMTESTCaseID:PIM-T-CASESENSITIVEDB-0001 Multi session case sensitive testcode"));
+ TheTest.Start(_L("@SYMTESTCaseID:PIM-T-CASESENSITIVEDB-0001 Multi session case sensitive testcode"));
TheTest.Title();
TheCleanup = CTrapCleanup::New();
--- a/phonebookengines_old/contactsmodel/tsrc/t_apac.cpp Tue Jul 06 14:05:47 2010 +0300
+++ b/phonebookengines_old/contactsmodel/tsrc/t_apac.cpp Wed Jul 21 11:09:07 2010 +0300
@@ -1082,17 +1082,17 @@
// Main.
//
-/**
+/**
-@SYMTestCaseID PIM-T-APAC-0001
+@SYMTestCaseID PIM-T-APAC-0001
-*/
+*/
GLDEF_C TInt E32Main()
{
__UHEAP_MARK;
// UserHal::SetAutoSwitchOffBehavior(ESwitchOffDisabled);
- test.Start(_L("@SYMTESTCaseID:PIM-T-APAC-0001 t_apac"));
+ test.Start(_L("@SYMTESTCaseID:PIM-T-APAC-0001 t_apac"));
CActiveScheduler* scheduler=new CActiveScheduler;
if (scheduler)
--- a/pimprotocols/phonebooksync/group/BLD.INF Tue Jul 06 14:05:47 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
-// All rights reserved.
-// This component and the accompanying materials are made available
-// under the terms of "Eclipse Public License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.eclipse.org/legal/epl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-// Phonebook Synchroniser
-//
-//
-
-PRJ_EXPORTS
-../group/phbksync.iby /epoc32/rom/include/phbksync.iby
-../Client/phbksync.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(phbksync.h)
-
-
-PRJ_TESTEXPORTS
-../group/TE_PhBkSync.iby /epoc32/rom/include/te_phbksync.iby
-
-../Test/TE_Sync/TE_Sync.script z:/testdata/scripts/te_sync.script
-../Test/TE_Sync/TE_Sync_MMTSY.script z:/testdata/scripts/te_sync_mmtsy.script
-../Test/TE_Sync/TE_Sync_Setup.script z:/testdata/scripts/te_sync_setup.script
-../Test/TE_Sync/TE_Sync_Setup_MMTSY.script z:/testdata/scripts/te_sync_setup_mmtsy.script
-../Test/TE_Sync/TE_Sync.cfg z:/testdata/configs/te_sync.cfg
-../Test/TE_Sync/TE_Sync_MMTSY.cfg z:/testdata/configs/te_sync_mmtsy.cfg
-../Test/TE_Sync/TE_Sync_Config.txt z:/testdata/configs/te_sync_config.txt
-
-../Test/TE_PhBkSync/TE_PhBkSync.script z:/testdata/scripts/te_phbksync.script
-../Test/TE_PhBkSync/TE_PhBkSync_Setup.script z:/testdata/scripts/te_phbksync_setup.script
-../Test/TE_PhBkSync/TE_PhBkSync_Config.txt z:/testdata/configs/te_phbksync_config.txt
-../Test/TE_PhBkSync/TE_PhBkSync.cfg z:/testdata/configs/te_phbksync.cfg
-
-../Test/TE_cntsync/te_cntsync.script z:/testdata/scripts/te_cntsync.script
-../Test/TE_cntsync/te_CntSync_setup.script z:/testdata/scripts/te_cntsync_setup.script
-../Test/TE_cntsync/te_cntsync_config.txt z:/testdata/configs/te_cntsync_config.txt
-../Test/TE_cntsync/te_cntsync.cfg z:/testdata/configs/te_cntsync.cfg
-
-PRJ_MMPFILES
-
-../group/phbksyncsvr.mmp
-../group/phbksyncplugin.mmp
-../group/phbksyncsvrexe.mmp
-
-PRJ_TESTMMPFILES
-
-../Test/TE_Sync/TE_Sync.mmp
-../Test/TE_PhBkSync/TE_PhBkSync.mmp
-../Test/TE_cntsync/te_cntsync.mmp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/pimprotocols/phonebooksync/group/bld.inf Wed Jul 21 11:09:07 2010 +0300
@@ -0,0 +1,54 @@
+// Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Phonebook Synchroniser
+//
+//
+
+PRJ_EXPORTS
+../group/phbksync.iby /epoc32/rom/include/phbksync.iby
+../Client/phbksync.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(phbksync.h)
+
+
+PRJ_TESTEXPORTS
+../group/TE_PhBkSync.iby /epoc32/rom/include/te_phbksync.iby
+
+../Test/TE_Sync/TE_Sync.script z:/testdata/scripts/te_sync.script
+../Test/TE_Sync/TE_Sync_MMTSY.script z:/testdata/scripts/te_sync_mmtsy.script
+../Test/TE_Sync/TE_Sync_Setup.script z:/testdata/scripts/te_sync_setup.script
+../Test/TE_Sync/TE_Sync_Setup_MMTSY.script z:/testdata/scripts/te_sync_setup_mmtsy.script
+../Test/TE_Sync/TE_Sync.cfg z:/testdata/configs/te_sync.cfg
+../Test/TE_Sync/TE_Sync_MMTSY.cfg z:/testdata/configs/te_sync_mmtsy.cfg
+../Test/TE_Sync/TE_Sync_Config.txt z:/testdata/configs/te_sync_config.txt
+
+../Test/TE_PhBkSync/TE_PhBkSync.script z:/testdata/scripts/te_phbksync.script
+../Test/TE_PhBkSync/TE_PhBkSync_Setup.script z:/testdata/scripts/te_phbksync_setup.script
+../Test/TE_PhBkSync/TE_PhBkSync_Config.txt z:/testdata/configs/te_phbksync_config.txt
+../Test/TE_PhBkSync/TE_PhBkSync.cfg z:/testdata/configs/te_phbksync.cfg
+
+../Test/TE_cntsync/te_cntsync.script z:/testdata/scripts/te_cntsync.script
+../Test/TE_cntsync/te_CntSync_setup.script z:/testdata/scripts/te_cntsync_setup.script
+../Test/TE_cntsync/te_cntsync_config.txt z:/testdata/configs/te_cntsync_config.txt
+../Test/TE_cntsync/te_cntsync.cfg z:/testdata/configs/te_cntsync.cfg
+
+PRJ_MMPFILES
+
+../group/phbksyncsvr.mmp
+../group/phbksyncplugin.mmp
+../group/phbksyncsvrexe.mmp
+
+PRJ_TESTMMPFILES
+
+../Test/TE_Sync/TE_Sync.mmp
+../Test/TE_PhBkSync/TE_PhBkSync.mmp
+../Test/TE_cntsync/te_cntsync.mmp
--- a/sysdef_1_4_0.dtd Tue Jul 06 14:05:47 2010 +0300
+++ b/sysdef_1_4_0.dtd Wed Jul 21 11:09:07 2010 +0300
@@ -1,86 +1,86 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
- name CDATA #REQUIRED
- schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
- name CDATA #REQUIRED
- levels CDATA #IMPLIED
- span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
- name CDATA #REQUIRED
- level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
- unitID ID #REQUIRED
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- bldFile CDATA #REQUIRED
- priority CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
- name CDATA #REQUIRED
- mrp CDATA #REQUIRED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
- name CDATA #REQUIRED
- version CDATA #REQUIRED
- late (Y|N) #IMPLIED
- filter CDATA #IMPLIED
- contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
- name ID #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
- name ID #REQUIRED
- description CDATA #REQUIRED
- target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
- name ID #REQUIRED
- abldTarget CDATA #REQUIRED
- description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
- name ID #REQUIRED
- abldOption CDATA #REQUIRED
- description CDATA #REQUIRED
- enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
- name ID #REQUIRED
- description CDATA #REQUIRED
- filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
- command CDATA #REQUIRED
- targetList IDREFS #IMPLIED
- unitParallel (Y | N | y | n) #REQUIRED
- targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
- name CDATA #REQUIRED
- cwd CDATA #REQUIRED
- command CDATA #REQUIRED>
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+ name CDATA #REQUIRED
+ schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+ name CDATA #REQUIRED
+ levels CDATA #IMPLIED
+ span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+ name CDATA #REQUIRED
+ level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+ unitID ID #REQUIRED
+ name CDATA #REQUIRED
+ mrp CDATA #REQUIRED
+ filter CDATA #IMPLIED
+ bldFile CDATA #REQUIRED
+ priority CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+ name CDATA #REQUIRED
+ mrp CDATA #REQUIRED
+ filter CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+ name CDATA #REQUIRED
+ version CDATA #REQUIRED
+ late (Y|N) #IMPLIED
+ filter CDATA #IMPLIED
+ contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+ name ID #REQUIRED
+ description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+ name ID #REQUIRED
+ description CDATA #REQUIRED
+ target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+ name ID #REQUIRED
+ abldTarget CDATA #REQUIRED
+ description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+ name ID #REQUIRED
+ abldOption CDATA #REQUIRED
+ description CDATA #REQUIRED
+ enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+ name ID #REQUIRED
+ description CDATA #REQUIRED
+ filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+ command CDATA #REQUIRED
+ targetList IDREFS #IMPLIED
+ unitParallel (Y | N | y | n) #REQUIRED
+ targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+ name CDATA #REQUIRED
+ cwd CDATA #REQUIRED
+ command CDATA #REQUIRED>