diff -r 2666d9724c76 -r d4f567ce2e7c predictivesearch/PcsServer/src/CPcsSession.cpp --- a/predictivesearch/PcsServer/src/CPcsSession.cpp Thu Jul 15 18:22:55 2010 +0300 +++ b/predictivesearch/PcsServer/src/CPcsSession.cpp Thu Aug 19 09:41:07 2010 +0300 @@ -240,10 +240,11 @@ void CPcsSession::GetAsyncPcsResultsL(const RMessage2& aMessage) { __LATENCY_MARK ( _L("CPcsSession::GetAsyncPcsResultsL") ); - PRINT ( _L("Enter CPcsSession::GetAsyncPcsResultsL") ); + PRINT( _L("Enter CPcsSession::GetAsyncPcsResultsL") ); if ( iBufferOverFlow == EFalse ) { + // ------------------------------------------------------------- // Read search query from the message @@ -254,20 +255,10 @@ RPointerArray searchResults; RPointerArray searchSeqs; - - if( !iServer->IsChineseVariant() ) - { - PRINT ( _L("----Algorithm1 search----") ); - iServer->PluginInterface()->PerformSearchL(*iSettings, - *psQuery, - searchResults, - searchSeqs); - } - else - { - PRINT ( _L("----Algorithm2 fake search----") ); - } - + iServer->PluginInterface()->PerformSearchL(*iSettings, + *psQuery, + searchResults, + searchSeqs); CleanupStack::PopAndDestroy( psQuery ); // Dynamic data buffer @@ -393,18 +384,11 @@ // To hold matched location RArray sequenceLoc; - if( !iServer->IsChineseVariant() ) - { - PRINT ( _L("----Algorithm1 searchinput----") ); - iServer->PluginInterface()->SearchInputL(*psQuery, - *data, - searchSeqs, - sequenceLoc); - } - else - { - PRINT ( _L("----Algorithm2 fake searchinput----") ); - } + iServer->PluginInterface()->SearchInputL(*psQuery, + *data, + searchSeqs, + sequenceLoc); + // Delete the search query and search data CleanupStack::PopAndDestroy( data ); @@ -478,7 +462,7 @@ void CPcsSession::SearchMatchStringL(const RMessage2& aMessage) { PRINT ( _L("Enter CPcsSession::SearchMatchStringL") ); - __LATENCY_MARK ( _L("CPcsSession::SearchMatchStringL") ); + //__LATENCY_MARK ( _L("CPcsSession::SearchMatchStringL") ); // ------------------------------------------------------------- @@ -525,7 +509,8 @@ CleanupStack::PopAndDestroy(des); PRINT ( _L("End CPcsSession::SearchMatchStringL") ); - __LATENCY_MARKEND ( _L("CPcsSession::SearchMatchStringL") ); + //__LATENCY_MARKEND ( _L("CPcsSession::SearchMatchStringL") ); + } // ----------------------------------------------------------------------------