FCL/sf/app/contacts: comparison phonebookengines/contactsmodel/cntplsql/src/cpplpredictivesearchtable.cpp

equal deleted inserted replaced

-:de1630741fbe
+:2a11b5b00470
 // How many digits are stored at most in the numeric field
 // Since BIGINT is a signed 64-bit integer, store only 15 hexadecimal characters
 // to prevent overflow when comparing upper and lower limits.
 const TInt KMaxDigits = 15;
-const QChar KPadChar = 'a'; // Pad with hex-digit 0xA
 const quint64 KConversionError = 0xeeeeeeeeeeeeeee;
+#define MAPPED_CHAR_FOR_STAR	'a'
+#define MAPPED_CHAR_FOR_HASH	'b'
+const QChar KMappedQCharForStar = MAPPED_CHAR_FOR_STAR;
+const QChar KMappedQCharForHash = MAPPED_CHAR_FOR_HASH;
+// These must be same as in cpcskeymap.cpp
+const TChar KMappedCharForStar = MAPPED_CHAR_FOR_STAR;
+const TChar KMappedCharForHash = MAPPED_CHAR_FOR_HASH;
+const QChar KPadChar = 'f'; // Pad with hex-digit 0xF
 /**
 @param aDatabase A handle to the database.
 @param aProperties A contact properties object.
 /**
 @param aItem A contact item whose data are added to the table.
 */
-void CPplPredictiveSearchTable::CreateInDbL( CContactItem& aItem )
+void CPplPredictiveSearchTable::CreateInDbL(CContactItem& aItem)
 	{
 	RDebug::Print(_L("CPplPredictiveSearchTable::CreateInDbL"));
 	WriteToDbL(aItem);
 	RDebug::Print(_L("CPplPredictiveSearchTable::CreateInDbL ends"));
 	}
 Update is done in two steps: delete contact from all predictive search tables,
 then insert it into relevant tables.
 @param aItem A contact item whose data is updated in the database.
 */
-void CPplPredictiveSearchTable::UpdateL( const CContactItem& aItem )
+void CPplPredictiveSearchTable::UpdateL(const CContactItem& aItem)
 	{
 	RDebug::Print(_L("CPplPredictiveSearchTable::UpdateL"));
 	TBool lowDiskErrorOccurred(EFalse);
 	DeleteFromAllTablesL(aItem.Id(), lowDiskErrorOccurred);
 */
 void CPplPredictiveSearchTable::CreateTableL()
 	{
 	RDebug::Print(_L("CPplPredictiveSearchTable::CreateTableL"));
-	RDebug::Print(_L("Create 10 tables"));
+	RDebug::Print(_L("Create 12 tables"));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable0Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable1Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable2Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable3Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable4Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable5Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable6Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable7Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable8Stmnt));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable9Stmnt));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable10Stmnt));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateTable11Stmnt));
 	RDebug::Print(_L("Create indexes"));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbrIndexTable0));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr2IndexTable0));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbrIndexTable9));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr2IndexTable9));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr3IndexTable9));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr4IndexTable9));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbrIndexTable10));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr2IndexTable10));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr3IndexTable10));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr4IndexTable10));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbrIndexTable11));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr2IndexTable11));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr3IndexTable11));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateNbr4IndexTable11));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateFNIndexInTable0));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable0));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateFNIndexInTable1));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable1));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable7));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateFNIndexInTable8));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable8));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateFNIndexInTable9));
 	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable9));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateFNIndexInTable10));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable10));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateFNIndexInTable11));
+	User::LeaveIfError(iDatabase.Exec(KPredSearchCreateLNIndexInTable11));
 	RDebug::Print(_L("CPplPredictiveSearchTable::CreateTableL ends"));
 	}
 	// Using dummy table names here
 	TCntSqlStatementType insertType(EInsert, KSqlContactPredSearchTable0);
 	TCntSqlStatementType deleteType(EDelete, KSqlContactPredSearchTable0);
 	// Insert new record
-	// INSERT INTO predictivesearchX (X=0..9)
+	// INSERT INTO predictivesearchX (X=0..11)
 	//   (contact_id, nbr, nbr2, nbr3, nbr4, first_name, last_name)
 	//   VALUES (contact_id value, nbr value, nbr2 value, nbr3 value, nbr4 value,
 	//			 first_name value, last_name value);
 	iInsertStmnt = TSqlProvider::GetSqlStatementL(insertType);
 	iInsertStmnt->SetParamL(KPredSearchContactId,
 	// for WHERE contact_id = [contact id value]
 	whereContactIdClause->Des().AppendFormat(KWhereStringEqualsStringFormatText,
 		&KPredSearchContactId, &KPredSearchContactIdParam);
 	// Delete information of a particular contact item
-	// 	DELETE FROM predictivesearchX (X=0..9)
+	// 	DELETE FROM predictivesearchX (X=0..11)
 	//	WHERE contact_id = [contact id value];
 	iDeleteStmnt = TSqlProvider::GetSqlStatementL(deleteType);
 	iDeleteStmnt->SetConditionL(*whereContactIdClause);
 	CleanupStack::PopAndDestroy(whereContactIdClause);
 		numericTokens = GetNumericTokens(firstNameAsNbr, lastNameAsNbr);
 		tables = DetermineTables(numericTokens);
 	});
 	HBufC* tableName(NULL);
-	while ((tableName = GetTableNameL(tables)) != NULL)
+	while ((tableName = GetNextTableNameL(tables)) != NULL)
 		{
 		// Takes ownership. Clears also earlier SQL statement.
 		iInsertStmnt->SetTableName(tableName);
 		RSqlStatement stmnt;
 		CleanupClosePushL( stmnt );
 QList<TChar> CPplPredictiveSearchTable::DetermineTables(QStringList aTokens) const
 	{
 	QList<TChar> tables;
 	for (TInt i = aTokens.count() - 1; i >= 0; --i)
 		{
+		__ASSERT_ALWAYS(IsValidChar(aTokens[i][0]),
+						User::Panic(_L("DetermineTables"), KErrArgument));
 		TChar ch(aTokens[i][0].unicode());
-		__ASSERT_ALWAYS(IsValidChar(ch),
-						User::Panic(_L("DetermineTables"), KErrArgument));
 		if (!tables.contains(ch))
 			{
 			tables.append(ch);
 			}
 		}
 	return tables;
-	}
-// Ignore tokens beginning with something else than '0'..'9'.
-// Keep duplicate tokens to support e.g. search "202" when both FN and LN are "23".
-void
-CPplPredictiveSearchTable::AddTokens(HBufC* aString, QStringList& aTokens) const
-	{
-	if (aString)
-		{
-		QString s((QChar*)aString->Ptr(), aString->Length());
-#if defined(USE_ORBIT_KEYMAP)
-		QStringList tokens = s.split(iKeyMap->Separator(), QString::SkipEmptyParts);
-#else
-		QStringList tokens = s.split(' ', QString::SkipEmptyParts);
-#endif
-		// Select tokens in the same order they are in original aString
-		for (TInt i = 0; i < tokens.count(); ++i)
-			{
-			if (IsValidChar(tokens[i][0]))
-				{
-				aTokens.append(tokens[i]);
-				}
-			}
-		}
-	}
-TBool CPplPredictiveSearchTable::IsValidChar(TInt aChar) const
-	{
-	return (aChar >= '0' && aChar <= '9');
-	}
-TBool CPplPredictiveSearchTable::IsValidChar(QChar aChar) const
-	{
-	return (aChar >= '0' && aChar <= '9');
 	}
 // 1. get first token of LN
 // 2. get first token of FN
 tokens.count());
 	return tokens;
 	}
+// Ignore tokens beginning with invalid (unknown) character.
+// Keep duplicate tokens to support e.g. search "202" when both FN and LN are "23".
+void
+CPplPredictiveSearchTable::AddTokens(HBufC* aString, QStringList& aTokens) const
+	{
+	if (aString)
+		{
+		QString s((QChar*)aString->Ptr(), aString->Length());
+#if defined(USE_ORBIT_KEYMAP)
+		QStringList tokens = s.split(iKeyMap->Separator(), QString::SkipEmptyParts);
+#else
+		QStringList tokens = s.split(' ', QString::SkipEmptyParts);
+#endif
+		// Select tokens in the same order they are in original aString
+		for (TInt i = 0; i < tokens.count(); ++i)
+			{
+			if (IsValidChar(tokens[i][0]))
+				{
+				aTokens.append(tokens[i]);
+				}
+			}
+		}
+	}
+TBool CPplPredictiveSearchTable::IsValidChar(QChar aChar) const
+	{
+	return (aChar >= '0' && aChar <= '9') ||
+			aChar == MAPPED_CHAR_FOR_STAR ||
+			aChar == MAPPED_CHAR_FOR_HASH;
+	}
 void CPplPredictiveSearchTable::GetNextToken(QStringList& aSource,
 											 QStringList& aDestination) const
 	{
 	if (!aSource.isEmpty() && aDestination.count() < KMaxTokens)
 		{
 void
 CPplPredictiveSearchTable::DeleteFromAllTablesL(TContactItemId aContactId,
 											    TBool& aLowDiskErrorOccurred) const
 	{
 	QList<TChar> tables;
-	QT_TRYCATCH_LEAVING(tables = FillTableList());
+	QT_TRYCATCH_LEAVING(tables = FillAllTables());
 	HBufC* tableName(NULL);
-	while ((tableName = GetTableNameL(tables)) != NULL)
+	while ((tableName = GetNextTableNameL(tables)) != NULL)
 		{
 		iDeleteStmnt->SetTableName(tableName); // Clears also earlier SQL statement
 		RSqlStatement stmnt;
 		CleanupClosePushL(stmnt);
 		// accessed with iDeleteStmnt->ParameterIndex().
 		// It is the first and only parameter in query
 		const TInt KContactIdParamIndex(KFirstIndex);
 		User::LeaveIfError(stmnt.BindInt(KContactIdParamIndex, aContactId));
 		RDebug::Print(_L("CPplPredictiveSearchTable::DeleteFromAllTablesL execute statement"));
-		// Returns the amount of rows that were changed/inserted/deleted.
+		// Returns the amount of affected rows. As contact is not present each
-		// Since contact is not present in all tables, some operations return 0,
+		// table, some operations return 0, it is not an error.
-		// it is not an error.
 		TInt status = stmnt.Exec();
 		RDebug::Print(_L("CPplPredictiveSearchTable::DeleteFromAllTablesL rows deleted=%d"), status);
 		CleanupStack::PopAndDestroy(&stmnt);
 		if (status == KErrDiskFull)
 			}
 		}
 	}
-QList<TChar> CPplPredictiveSearchTable::FillTableList() const
+QList<TChar> CPplPredictiveSearchTable::FillAllTables() const
 	{
 	QList<TChar> tables;
-	const TInt KLargestKey = '9';
-	for (TInt i = '0'; i <= KLargestKey; ++i)
+	const TInt KLargestDigitKey = '9';
+	for (TInt i = '0'; i <= KLargestDigitKey; ++i)
 		{
 		TChar ch = i;
 		tables << ch;
 		}
+	tables << KMappedCharForStar;
+	tables << KMappedCharForHash;
 	return tables;
 	}
-HBufC* CPplPredictiveSearchTable::GetTableNameL(QList<TChar>& aTables) const
+HBufC* CPplPredictiveSearchTable::GetNextTableNameL(QList<TChar>& aTables) const
 	{
 	HBufC* tableName(NULL);
 	if (aTables.count() > 0)
 		{
-		TChar ch = aTables[0];
+// Enough space for the longest table name
-		__ASSERT_ALWAYS(IsValidChar(ch), User::Leave(KErrArgument));
+tableName = HBufC::NewL(KSqlContactPredSearchTable11().Length());
-// Each table's name has same length, replace last char with the correct one
-tableName = HBufC::NewL(KSqlContactPredSearchTable0().Length());
 TPtr ptr = tableName->Des();
-ptr.Append(KSqlContactPredSearchTable0);
+		ptr.Append(TableNameL(aTables[0]));
-ptr[ptr.Length() - 1] = ch;
 		aTables.removeFirst();
-		RDebug::Print(_L("CPplPredictiveSearchTable::GetTableNameL '%S'"), tableName);
+		RDebug::Print(_L("CPplPredictiveSearchTable::GetNextTableNameL '%S'"), tableName);
 }
 	return tableName;
 	}
+// when qwerty will be supported, keymap prob maps original chars to
-// E.g. aToken = "01230" -> append 'a' until has KMaxDigits characters
+// 0..9, a..z + few capital letters
-// -> "01230aaaaaaaaaa" -> convert to hexadecimal number -> 0x01230aaaaaaaaaa.
+const TDesC& CPplPredictiveSearchTable::TableNameL(TChar aCh) const
-// Leaving from this function causes panic, perhaps because of QString
+	{
-// parameter? So rather return an error code if conversion fails.
+	switch (aCh)
+		{
+		case '0': return KSqlContactPredSearchTable0;
+		case '1': return KSqlContactPredSearchTable1;
+		case '2': return KSqlContactPredSearchTable2;
+		case '3': return KSqlContactPredSearchTable3;
+		case '4': return KSqlContactPredSearchTable4;
+		case '5': return KSqlContactPredSearchTable5;
+		case '6': return KSqlContactPredSearchTable6;
+		case '7': return KSqlContactPredSearchTable7;
+		case '8': return KSqlContactPredSearchTable8;
+		case '9': return KSqlContactPredSearchTable9;
+		case MAPPED_CHAR_FOR_STAR: return KSqlContactPredSearchTable10;
+		case MAPPED_CHAR_FOR_HASH: return KSqlContactPredSearchTable11;
+		default:
+			TUint ch = aCh;
+			RDebug::Print(_L("CPplPredictiveSearchTable::TableName unknown char '%c'"), ch);
+			User::Leave(KErrArgument);
+			return KNullDesC;
+		}
+	}
+// E.g. aToken = "01230" -> append KPadChar until has KMaxDigits characters
+// -> "01230ffffffffff" -> convert to hexadecimal number -> 0x01230ffffffffff.
+// If this function would leave, causes panic, perhaps because of QString parameter?
 quint64 CPplPredictiveSearchTable::ConvertToHex(QString aToken) const
 	{
 	if (aToken.length() > KMaxDigits)
 		{
 		return KConversionError;

changeset 31	2a11b5b00470
parent 27	de1630741fbe
child 46	efe85016a067