diff -r 2e8eeb919028 -r b538b70cbe51 settingsengines/sdb/tests/config/group_itests/cntmodel.rss
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/settingsengines/sdb/tests/config/group_itests/cntmodel.rss	Thu Mar 11 18:20:56 2010 +0200
@@ -0,0 +1,884 @@
+// Copyright (c) 1997-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:
+// The default template resource
+// 
+//
+
+// BOTH THESE HEADERS NEED TO BE PUBLIC
+//
+
+
+#include "cntmodel.rls"
+#include <cntdef.hrh> // as existing version, but see below
+#include <cntmodel.rh>
+
+
+//  
+// There are two ways of defining custom filterable fields.  The two methods cannot be mixed.
+//
+// Option 1. uses a single flag (KIntFieldFlagFilterable) to define up to four custom filterable fields. 
+// The order of priority of the fields is the order in which they are defined in an rss file. 
+// 
+// Option 2.uses four flags to define up to four custom filterable fields. KIntFieldFlagFilterable1 defines the highest priority 
+// field and KIntFieldFlagFilterable4 defines the lowest priority one. The order in which the fields appear in an rss file
+// is unimportant.
+// In total, the filterable fields must define a series starting at KIntFieldFlagFilterable1 and without gaps (e.g. it is possible 
+// to define fields with KIntFieldFlagFilterable3, KIntFieldFlagFilterable1 and KIntFieldFlagFilterable2, but illegal 
+// to define fields with KIntFieldFlagFilterable1, KIntFieldFlagFilterable4 and KIntFieldFlagFilterable3).
+// NOTE: see STRING_r_cntui_new_field_defns52 and STRING_r_cntui_new_field_defns51 below.
+//  
+
+// These field type UIDs are used in testing of the custom filterable fields only.
+// Licensees should register new UIDs for their own filterable fields.
+
+#define KUidContactFieldCustom1Value		0x101FD209
+#define KUidContactFieldCustom2Value		0x101FD20A
+
+//
+// FROM EIKDEF.RH - avoids CntModel requiring Eikon
+//
+STRUCT RSS_SIGNATURE
+    {
+    LONG signature; // EEikResourceSignatureValue;=4
+    SRLINK self;
+    }
+
+STRUCT ARRAY
+    {
+    STRUCT items[];
+    }
+
+RESOURCE RSS_SIGNATURE { }
+
+//
+// The template data
+//
+RESOURCE ARRAY r_cntui_new_field_defns
+    {
+    items=
+        {
+// home or personal jobbies
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPrefixNameValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns1;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldGivenNameValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns2;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldAdditionalNameValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns3;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldFamilyNameValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns4;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSuffixNameValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns5;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; },
+			    MAPPING { mapping=KIntContactFieldVCardMapCELL; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns6;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns7;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldFaxValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+			    MAPPING { mapping=KIntContactFieldVCardMapFAX; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns8;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; },
+			    MAPPING { mapping=KIntContactFieldVCardMapPAGER; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns9;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapBBS; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns10;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapMODEM; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns11;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; },
+				MAPPING { mapping=KIntContactFieldVCardMapCAR; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns12;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapISDN; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns13;
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; },
+				MAPPING { mapping=KIntContactFieldVCardMapVIDEO; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns14;
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldEMailValue;
+			vCardMapping=KIntContactFieldVCardMapEMAILINTERNET;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns15;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPostOfficeValue;
+			vCardMapping=KIntContactFieldVCardMapPOSTOFFICE;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns16; 
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldExtendedAddressValue;
+			vCardMapping=KIntContactFieldVCardMapEXTENDEDADR;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns17;
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldAddressValue;
+			vCardMapping=KIntContactFieldVCardMapADR;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns18;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldLocalityValue;
+			vCardMapping=KIntContactFieldVCardMapLOCALITY;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns19;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldRegionValue;
+			vCardMapping=KIntContactFieldVCardMapREGION;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns20;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPostCodeValue;
+			vCardMapping=KIntContactFieldVCardMapPOSTCODE;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns21;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldCountryValue;
+			vCardMapping=KIntContactFieldVCardMapCOUNTRY;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns22;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldUrlValue;
+			vCardMapping=KIntContactFieldVCardMapURL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns23;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldIMAddressValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWV; },
+			    MAPPING { mapping=KIntContactFieldVCardMapHOME; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_im_addr_wv;
+			},
+	FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSecondNameValue;
+			vCardMapping=KIntContactFieldVCardMapSECONDNAME;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_second_name;
+			},			
+// work jobbies
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldCompanyNameValue;
+			vCardMapping=KIntContactFieldVCardMapORG;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns24;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldJobTitleValue;
+			vCardMapping=KIntContactFieldVCardMapTITLE;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns25;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; },
+				MAPPING { mapping=KIntContactFieldVCardMapCELL; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns26;
+			flags=EContactFieldFlagDisabled;		
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns27;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldFaxValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+			    MAPPING { mapping=KIntContactFieldVCardMapFAX; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns28;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapPAGER; },
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns29;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapBBS; }
+				};
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns30;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapMODEM; }
+				};
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns31;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapVOICE; },
+				MAPPING { mapping=KIntContactFieldVCardMapCAR; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns32;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapISDN; }
+				};
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns33;
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapTEL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; },
+				MAPPING { mapping=KIntContactFieldVCardMapVIDEO; }
+				};
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns34;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldEMailValue;
+			vCardMapping=KIntContactFieldVCardMapEMAILINTERNET;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns35;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldUrlValue;
+			vCardMapping=KIntContactFieldVCardMapURL;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns36;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPostOfficeValue;
+			vCardMapping=KIntContactFieldVCardMapPOSTOFFICE;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns37;
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldExtendedAddressValue;
+			vCardMapping=KIntContactFieldVCardMapEXTENDEDADR;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns38;
+			flags=EContactFieldFlagDisabled;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldAddressValue;
+			vCardMapping=KIntContactFieldVCardMapADR;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns39;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldLocalityValue;
+			vCardMapping=KIntContactFieldVCardMapLOCALITY;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns40;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldRegionValue;
+			vCardMapping=KIntContactFieldVCardMapREGION;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns41;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPostCodeValue;
+			vCardMapping=KIntContactFieldVCardMapPOSTCODE;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns42;
+			},
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldCountryValue;
+			vCardMapping=KIntContactFieldVCardMapCOUNTRY;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns43;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeStore;
+			contactFieldType=KUidContactFieldPictureValue;
+			vCardMapping=KIntContactFieldVCardMapLOGO;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns44;
+			flags=EContactFieldFlagHidden;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldIMAddressValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapWV; },
+			    MAPPING { mapping=KIntContactFieldVCardMapWORK; }
+			    };
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns_im_addr_wv;
+			},
+
+// other jobbies
+        FIELD
+			{
+			fieldStorageType=KStorageTypeDateTime;
+			contactFieldType=KUidContactFieldBirthdayValue;
+			vCardMapping=KIntContactFieldVCardMapBDAY;
+			category=EContactCategoryOther;
+			fieldName=STRING_r_cntui_new_field_defns45;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldNoteValue;
+			vCardMapping=KIntContactFieldVCardMapNOTE;
+			category=EContactCategoryOther;
+			fieldName=STRING_r_cntui_new_field_defns46;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldAssistantValue;
+			vCardMapping=KIntContactFieldVCardMapAssistant;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns64;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldPhoneNumberValue;
+			vCardMapping=KIntContactFieldVCardMapAssistantTel;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns65;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeDateTime;
+			contactFieldType=KUidContactFieldAnniversaryValue;
+			vCardMapping=KIntContactFieldVCardMapAnniversary;
+			category=EContactCategoryOther;
+			fieldName=STRING_r_cntui_new_field_defns66;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSpouseValue;
+			vCardMapping=KIntContactFieldVCardMapSpouse;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns67;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldChildrenValue;
+			vCardMapping=KIntContactFieldVCardMapChildren;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns68;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldClassValue;
+			vCardMapping=KIntContactFieldVCardMapClass;
+			category=EContactCategoryOther;
+			fieldName=STRING_r_cntui_new_field_defns69;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldDepartmentNameValue;
+			vCardMapping=KIntContactFieldVCardMapDepartment;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns70;
+			},
+			
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldNoneValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedFN;
+			category=EContactCategoryNone;
+			fieldName=STRING_r_cntui_new_field_defns47;
+			flags=EContactFieldFlagHidden;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeStore;
+			contactFieldType=KUidContactFieldPictureValue;
+			vCardMapping=KIntContactFieldVCardMapPHOTO;
+			category=EContactCategoryNone;
+			fieldName=STRING_r_cntui_new_field_defns48;
+			flags=EContactFieldFlagHidden;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldNoneValue;
+			vCardMapping=KIntContactFieldVCardMapLABEL;
+			category=EContactCategoryNone;
+			fieldName=STRING_r_cntui_new_field_defns49;
+			flags=EContactFieldFlagDisabled;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldTemplateLabelValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryNone;
+			fieldName=STRING_r_cntui_new_field_defns50;
+			flags=EContactFieldFlagHidden;
+			},
+//=============================================================================
+// new fields for custom filtering
+//=============================================================================
+	   FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldCustom2Value;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryNone;
+			fieldName=STRING_r_cntui_new_field_defns52;
+			flags=KIntFieldFlagFilterable2|KIntFieldFlagSynchronize;
+			},
+    FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldCustom1Value;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryNone;
+			fieldName=STRING_r_cntui_new_field_defns51;
+			flags=EContactFieldFlagFilterable1;
+			},     
+	
+//=============================================================================
+// new fields for pronunciation
+//=============================================================================
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldGivenNamePronunciationValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_first_name_prn;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldFamilyNamePronunciationValue;
+			vCardMapping=KIntContactFieldVCardMapUnusedN;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_last_name_prn;
+			},
+        FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldCompanyNamePronunciationValue;
+			vCardMapping=KIntContactFieldVCardMapORGPronunciation;
+			category=EContactCategoryWork;
+			fieldName=STRING_r_cntui_new_field_defns_company_prn;
+			},						
+//=============================================================================
+// Fields for SIP identity.
+//=============================================================================
+		FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSIPIDValue;
+			vCardMapping=KIntContactFieldVCardMapSIPID;
+			extraMapping=
+			    {
+			    MAPPING { mapping=KIntContactFieldVCardMapPOC; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_sip_id_poc;
+			},
+	FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSIPIDValue;
+			vCardMapping=KIntContactFieldVCardMapSIPID;
+			extraMapping=
+			    {
+				MAPPING { mapping=KIntContactFieldVCardMapSWIS; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_sip_id_swis;
+			},
+	FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSIPIDValue;
+			vCardMapping=KIntContactFieldVCardMapSIPID;
+			extraMapping=
+			    {
+				MAPPING { mapping=KIntContactFieldVCardMapVOIP; }
+			    };
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_sip_id_voip;
+			},
+	FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldSIPIDValue;
+			vCardMapping=KIntContactFieldVCardMapSIPID;
+			extraMapping=
+				{
+				MAPPING { mapping=KIntContactFieldVCardMapSIPID; }
+				};
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_sip_id_generic;
+			},
+//=============================================================================
+// Fields for IM Wireless Village identity.
+//=============================================================================
+	FIELD
+			{
+			fieldStorageType=KStorageTypeText;
+			contactFieldType=KUidContactFieldIMAddressValue;
+			vCardMapping=KIntContactFieldVCardMapWV;
+			category=EContactCategoryHome;
+			fieldName=STRING_r_cntui_new_field_defns_im_addr_wv;
+			},
+//=============================================================================
+// Fields for GEO Location.
+//=============================================================================
+	FIELD 
+	        {
+	        fieldStorageType=KStorageTypeText;
+	        contactFieldType=KUidContactFieldGEOValue;
+	        vCardMapping=KIntContactFieldVCardMapGEO;
+	        category=EContactCategoryHome;
+	        fieldName=STRING_r_cntui_new_field_defns_geo;
+	        }
+        };
+    }
+