FCL/sf/app/contacts: comparison predictivesearch/PcsServer/src/CPcsSession.cpp

equal deleted inserted replaced

-:4ae315f230bc
+:a6539d1e8e43
 case ESetSortOrder:
 			PRINT ( _L("Received function ESetSortOrder") );
 			ChangeSortOrderL(aMessage);
 			break;
+case EGetAdaptiveGrid:
+PRINT ( _L("Received function EGetAdaptiveGrid") );
+			GetAdaptiveGridL(aMessage);
+			break;
 	    case EShutdown:
 		    PRINT ( _L("Received function EShutdown") );
 			ShutdownServerL(aMessage);
 			break;
 }
 	    // Read search query from the message
 	    CPsQuery* psQuery = ReadQueryLC( 0, aMessage );
 	    // -------------------------------------------------------------
-RPointerArray<CPsClientData>  searchResults;
+RPointerArray<CPsClientData> searchResults;
-RPointerArray<CPsPattern>     searchSeqs;
+RPointerArray<CPsPattern> searchSeqs;
 iServer->PluginInterface()->PerformSearchL(*iSettings,
 *psQuery,
 searchResults,
 searchSeqs);
 		iBufferOverFlow = EFalse;
 	delete iDes;
 iDes = NULL;
 }
 PRINT ( _L("End CPcsSession::GetAsyncPcsResultsL") );
 __LATENCY_MARKEND ( _L("CPcsSession::GetAsyncPcsResultsL") );
 }
 // ----------------------------------------------------------------------------
 // CPcsSession::SearchInputL
 //
 	iServer->PluginInterface()->SearchInputL(*psQuery,
 	                                         *data,
 	                                         searchSeqs,
 	                                         sequenceLoc);
 // Delete the search query and search data
 	CleanupStack::PopAndDestroy( data );
 CleanupStack::PopAndDestroy( psQuery );
 	CleanupStack::PopAndDestroy(2, buf); // buf, stream
 PRINT ( _L("End CPcsSession::SearchInputL") );
 __LATENCY_MARKEND ( _L("CPcsSession::SearchInputL") );
 }
 // ----------------------------------------------------------------------------
 // CPcsSession::SearchMatchStringL
 //
 searchDataStream.PushL();
 // Data to be searched
 // Read data size
 TUint16 szData = searchDataStream.ReadUint16L();
-HBufC* data =  HBufC::NewL(searchDataStream, szData);
+HBufC* data = HBufC::NewL(searchDataStream, szData);
 // searchQueryStream, searchQuery
 CleanupStack::PopAndDestroy(2, searchData);
 CleanupStack::PushL( data );
 // -------------------------------------------------------------
-iServer->PluginInterface()->SearchMatchStringL(*psQuery,
+iServer->PluginInterface()->SearchMatchStringL( *psQuery, *data, ptr );
-*data,
-ptr);
 // Delete the search query and search data
 CleanupStack::PopAndDestroy( data );
 CleanupStack::PopAndDestroy( psQuery );
 aMessage.Complete(KErrNone);
 CleanupStack::PopAndDestroy(des);
 PRINT ( _L("End CPcsSession::SearchMatchStringL") );
 __LATENCY_MARKEND ( _L("CPcsSession::SearchMatchStringL") );
 }
 // ----------------------------------------------------------------------------
 // CPcsSession::IsLanguageSupportedL
 //
 	// Size of URI
 	TInt uriSize = stream.ReadUint16L();
 // URI
 HBufC* uri = HBufC::NewLC(stream, uriSize);
 // --------------------------------------------------------------
 // Get the data order
 RArray<TInt> dataOrder;
 PRINT ( _L("End CPcsSession::ChangeSortOrderL") );
 }
 // ----------------------------------------------------------------------------
+// CPcsSession::GetAdaptiveGridL
+//
+// ----------------------------------------------------------------------------
+void CPcsSession::GetAdaptiveGridL(const RMessage2& aMessage)
+{
+PRINT ( _L("Enter CPcsSession::GetAdaptiveGridL") );
+__LATENCY_MARK ( _L("CPcsSession::GetAdaptiveGridL") );
+// Create the result output buffer
+HBufC* outBuf = HBufC::NewLC( KBufferMaxLen );
+TPtr outBufPtr( outBuf->Des() );
+// ------- Read the Data Stores from the message -------
+// Read URIs from the message
+HBufC8* buffer = HBufC8::NewLC(KBufferMaxLen);
+TPtr8 bufferPtr(buffer->Des());
+aMessage.ReadL(0, bufferPtr);
+// Stream over the buffer
+RDesReadStream stream(bufferPtr);
+stream.PushL();
+// Number of URIs
+TUint16 uriCount = stream.ReadUint16L();
+CDesCArrayFlat* dataStores = NULL;
+dataStores = new (ELeave) CDesCArrayFlat( uriCount );
+CleanupStack::PushL( dataStores );
+for (TUint i = 0; i < uriCount; i++ )
+{
+// Size of URI
+TUint16 uriSize = stream.ReadUint16L();
+// URI
+HBufC* uri = HBufC::NewLC( stream, uriSize );
+dataStores->AppendL( *uri );
+CleanupStack::PopAndDestroy( uri );
+}
+// -----------------------------------------------------
+// Read the Company Name from the message
+TBool companyName = aMessage.Int1();
+// Get the Adaptive Grid
+iServer->PluginInterface()->GetAdaptiveGridL( *dataStores, companyName, outBufPtr );
+// Write the Adaptive Grid to the message
+aMessage.Write( 2, *outBuf );
+aMessage.Complete( KErrNone );
+// Cleanup
+CleanupStack::PopAndDestroy( dataStores );
+CleanupStack::PopAndDestroy( &stream );
+CleanupStack::PopAndDestroy( buffer );
+CleanupStack::PopAndDestroy( outBuf );
+PRINT ( _L("End CPcsSession::GetAdaptiveGridL") );
+__LATENCY_MARKEND ( _L("CPcsSession::GetAdaptiveGridL") );
+}
+// ----------------------------------------------------------------------------
 // CPcsSession::ShutdownServerL
 //
 // ----------------------------------------------------------------------------
 void CPcsSession::ShutdownServerL(const RMessage2& aMessage)
 {
 // CPcsSession::ReadQueryLC
 //
 // ----------------------------------------------------------------------------
 CPsQuery* CPcsSession::ReadQueryLC( TInt aParam, const RMessage2& aMessage )
 {
+PRINT( _L("Enter CPcsSession::ReadQueryLC") );
 TInt size = aMessage.GetDesLength( aParam );
+if(size < 0)
+{
+PRINT ( _L("DesLength <0, Leave from  CPcsSession::ReadQueryLC"));
+User::Leave(KErrArgument);
+}
 HBufC8* tempBuf = HBufC8::NewLC( size );
 TPtr8 ptr( tempBuf->Des() );
 aMessage.ReadL( aParam, ptr );
 CleanupStack::Pop( psQuery ); // temporarily
 CleanupStack::PopAndDestroy( &stream );
 CleanupStack::PopAndDestroy( tempBuf );
 CleanupStack::PushL( psQuery );
+PRINT ( _L("End CPcsSession::ReadQueryLC") );
 return psQuery;
 }

branch	RCL_3
changeset 39	a6539d1e8e43
parent 15	e8e3147d53eb
child 45	34879f5cfc63