diff -r 5586b4d2ec3e -r 0d28c1c5b6dd phonebookengines/contactsmodel/cntplsql/src/cpplcommaddrtable.cpp
--- a/phonebookengines/contactsmodel/cntplsql/src/cpplcommaddrtable.cpp	Wed Apr 14 15:45:35 2010 +0300
+++ b/phonebookengines/contactsmodel/cntplsql/src/cpplcommaddrtable.cpp	Tue Apr 27 16:23:35 2010 +0300
@@ -694,79 +694,154 @@
 @return Array of contact IDs which are candidate matches.
 */
 CContactIdArray* CPplCommAddrTable::MatchPhoneNumberL(const TDesC& aNumber, const TInt aMatchLengthFromRight)
-	{
-	CContactIdArray* phoneMatchArray = CContactIdArray::NewLC();
+    {
+    CContactIdArray* phoneMatchArray = CContactIdArray::NewLC();
+
+    TInt numLowerDigits = aMatchLengthFromRight;
+    TInt numUpperDigits = 0;
 
-	TInt numLowerDigits = aMatchLengthFromRight;
-	TInt numUpperDigits = 0;
+    if(numLowerDigits > KLowerSevenDigits)
+        {
+        // New style matching.
+        numLowerDigits = KLowerSevenDigits;
+        numUpperDigits = aMatchLengthFromRight - KLowerSevenDigits;
+        }
 
-	if(numLowerDigits > KLowerSevenDigits)
-		{
-		// New style matching.
-		numLowerDigits = KLowerSevenDigits;
-		numUpperDigits = aMatchLengthFromRight - KLowerSevenDigits;
-		}
+    TMatch phoneDigits = CreatePaddedPhoneDigitsL(aNumber, numLowerDigits, numUpperDigits);
+
+    if (phoneDigits.iNumLowerDigits + phoneDigits.iNumUpperDigits > 0)
+        {
+        // build statement
+        RSqlStatement stmnt;
+        CleanupClosePushL(stmnt);
+        stmnt.PrepareL(iDatabase, iMatchSelectStmnt->SqlStringL() );
+
+        const TInt KValueParamIndex(KFirstParam);           // first parameter in query...
+        const TInt KTypeParamIndex(KValueParamIndex + 1);   // ...and the second.
+
+        User::LeaveIfError(stmnt.BindInt(KValueParamIndex, phoneDigits.iLowerSevenDigits ));
+        User::LeaveIfError(stmnt.BindInt(KTypeParamIndex, EPhoneNumber ));
 
-	TMatch phoneDigits = CreatePaddedPhoneDigitsL(aNumber, numLowerDigits, numUpperDigits);
+        // fetch the list of any matching contact ids
+        TInt err(KErrNone);
+        const TInt KContactIdIdx(iMatchSelectStmnt->ParameterIndex(KCommAddrContactId() ) );
+        const TInt KExtraValueIdx(iMatchSelectStmnt->ParameterIndex(KCommAddrExtraValue() ) );
+        while ((err = stmnt.Next() ) == KSqlAtRow)
+            {
+            if (aMatchLengthFromRight <= KLowerSevenDigits)
+                {
+                // Matching 7 or less digits...we've already matched.
+                phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx) );
+                }
+            else
+                {
+                // Check the upper digits...
+                TInt32 storedUpperDigits(0);
+                TPtrC extValString = stmnt.ColumnTextL(KExtraValueIdx);
+                User::LeaveIfError(TLex(extValString).Val(storedUpperDigits) );
 
-	if (phoneDigits.iNumLowerDigits + phoneDigits.iNumUpperDigits > 0)
-		{
-		// build statement
-		RSqlStatement stmnt;
-		CleanupClosePushL(stmnt);
-		stmnt.PrepareL(iDatabase, iMatchSelectStmnt->SqlStringL() );
+                const TInt KDigitsToRemove = KMaxPhoneMatchLength - KLowerSevenDigits - phoneDigits.iNumUpperDigits;
+                for(TInt i = 0; i < KDigitsToRemove; ++i)
+                    {
+                    // repeatedly divide by 10 to lop off the appropriate number of digits from the right
+                    storedUpperDigits /= 10;
+                    }
+
+                storedUpperDigits = TMatch::PadOutPhoneMatchNumber(storedUpperDigits, KDigitsToRemove);
 
-		const TInt KValueParamIndex(KFirstParam);			// first parameter in query...
-		const TInt KTypeParamIndex(KValueParamIndex + 1);	// ...and the second.
+                if (phoneDigits.iUpperDigits == storedUpperDigits)
+                    {
+                    phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx) );
+                    }
+                }
+            }
 
-    	User::LeaveIfError(stmnt.BindInt(KValueParamIndex, phoneDigits.iLowerSevenDigits ));
-    	User::LeaveIfError(stmnt.BindInt(KTypeParamIndex, EPhoneNumber ));
+        // leave if we didn't complete going through the results properly
+        if(err != KSqlAtEnd)
+            {
+            User::Leave(err);
+            }
+        CleanupStack::PopAndDestroy(&stmnt);
+        }
+
+    CleanupStack::Pop(phoneMatchArray);
+    return phoneMatchArray;
+    }
 
-		// fetch the list of any matching contact ids
-		TInt err(KErrNone);
-		const TInt KContactIdIdx(iMatchSelectStmnt->ParameterIndex(KCommAddrContactId() ) );
-		const TInt KExtraValueIdx(iMatchSelectStmnt->ParameterIndex(KCommAddrExtraValue() ) );
-		while ((err = stmnt.Next() ) == KSqlAtRow)
-			{
-			if (aMatchLengthFromRight <= KLowerSevenDigits)
-				{
-				// Matching 7 or less digits...we've already matched.
-				phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx) );
-				}
-			else
-				{
-				// Check the upper digits...
-				TInt32 storedUpperDigits(0);
-				TPtrC extValString = stmnt.ColumnTextL(KExtraValueIdx);
-				User::LeaveIfError(TLex(extValString).Val(storedUpperDigits) );
+/**
+Returns an array of contact item IDs for all the contact items which may contain
+the specified telephone number in a telephone, fax or SMS type field.
+
+This is improved version of MatchPhoneNumberL method.
+The number is compared starting from the right side of the number and 
+the method returns an array of candidate matches.  
+Punctuation (e.g. spaces) and other alphabetic characters are ignored
+when comparing. Leading zeros are removed. Digits are compared up to 
+the lenght of shorter number.
+
+@param aNumber Phone number string.
+@return Array of contact IDs which are candidate matches.
+*/
+CContactIdArray* CPplCommAddrTable::BestMatchingPhoneNumberL(const TDesC& aNumber)
+    {
+    const TInt KUpperMaxLength = KMaxPhoneMatchLength - KLowerSevenDigits;
+
+    CContactIdArray* phoneMatchArray = CContactIdArray::NewLC();
+
+    TMatch phoneDigits = CreatePaddedPhoneDigitsL(aNumber, KLowerSevenDigits, KUpperMaxLength);
+
+    if (phoneDigits.iNumLowerDigits + phoneDigits.iNumUpperDigits > 0)
+        {
+        // build statement
+        RSqlStatement stmnt;
+        CleanupClosePushL(stmnt);
+        stmnt.PrepareL(iDatabase, iMatchSelectStmnt->SqlStringL());
+
+        const TInt KValueParamIndex(KFirstParam); // first parameter in query...
+        const TInt KTypeParamIndex(KValueParamIndex + 1); // ...and the second.
+
+        User::LeaveIfError(stmnt.BindInt(KValueParamIndex,
+                phoneDigits.iLowerSevenDigits));
+        User::LeaveIfError(stmnt.BindInt(KTypeParamIndex, EPhoneNumber));
 
-				const TInt KDigitsToRemove = KMaxPhoneMatchLength - KLowerSevenDigits - phoneDigits.iNumUpperDigits;
-				for(TInt i = 0; i < KDigitsToRemove; ++i)
-					{
-					// repeatedly divide by 10 to lop off the appropriate number of digits from the right
-					storedUpperDigits /= 10;
-					}
-
-				storedUpperDigits = TMatch::PadOutPhoneMatchNumber(storedUpperDigits, KDigitsToRemove);
+        // fetch the list of any matching contact ids
+        TInt err(KErrNone);
+        const TInt KContactIdIdx(iMatchSelectStmnt->ParameterIndex( KCommAddrContactId()));
+        const TInt KExtraValueIdx(iMatchSelectStmnt->ParameterIndex(KCommAddrExtraValue()));
+        while ((err = stmnt.Next()) == KSqlAtRow)
+            {
+            // Check the upper digits...
+            TInt32 number = phoneDigits.iUpperDigits;
+            TPtrC extValString = stmnt.ColumnTextL(KExtraValueIdx);
+            TInt32 storedUpperDigits;
+            User::LeaveIfError(TLex(extValString).Val(storedUpperDigits));
+            TInt32 stored = storedUpperDigits;
 
-				if (phoneDigits.iUpperDigits == storedUpperDigits)
-					{
-					phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx) );
-					}
-				}
-			}
+            while ( (number != 0) && (stored != 0) &&
+                    (number % 10 == 0 || stored % 10 == 0) )
+                {
+                number /= 10;
+                stored /= 10;
+                }
 
-		// leave if we didn't complete going through the results properly
-		if(err != KSqlAtEnd)
-			{
-			User::Leave(err);
-			}
-		CleanupStack::PopAndDestroy(&stmnt);
-		}
+            if ( (phoneDigits.iUpperDigits == 0) || (storedUpperDigits == 0) ||
+                 (number == stored) )
+                {
+                phoneMatchArray->AddL(stmnt.ColumnInt(KContactIdIdx));
+                }
+            }
 
-	CleanupStack::Pop(phoneMatchArray);
-	return phoneMatchArray;
-	}
+        // leave if we didn't complete going through the results properly
+        if (err != KSqlAtEnd)
+            {
+            User::Leave(err);
+            }
+        CleanupStack::PopAndDestroy(&stmnt);
+        }
+
+    CleanupStack::Pop(phoneMatchArray);
+    return phoneMatchArray;
+    }
 
 
 /**
@@ -895,7 +970,6 @@
 	return phoneNumber;
 	}
 
-
 /**
 CPplCommAddrTable::TMatch constructor.
 */