diff -r 2828b4d142c0 -r 4ae315f230bc predictivesearch/PcsAlgorithm/Algorithm1/src/CPsDataPluginInterface.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm1/src/CPsDataPluginInterface.cpp Tue May 11 16:00:21 2010 +0300 +++ b/predictivesearch/PcsAlgorithm/Algorithm1/src/CPsDataPluginInterface.cpp Tue May 25 12:26:45 2010 +0300 @@ -175,17 +175,17 @@ // CPsDataPluginInterface::RequestForDataL // Requests for data from the data store // ---------------------------------------------------------------------------- -void CPsDataPluginInterface::RequestForDataL(TDesC& aDataStore) +void CPsDataPluginInterface::RequestForDataL(TDesC& aDataStore) { PRINT ( _L("Enter CPsDataPluginInterface::RequestForDataL") ); for ( TInt idx = 0; idx < iPsDataPluginInstances.Count(); idx++ ) { - if(iPsDataPluginInstances[idx]->IsDataStoresSupportedL(aDataStore)) + if ( iPsDataPluginInstances[idx]->IsDataStoresSupportedL(aDataStore) ) { - iPsDataPluginInstances[idx]->RequestForDataL(aDataStore); - break; + iPsDataPluginInstances[idx]->RequestForDataL(aDataStore); + break; } } @@ -197,14 +197,14 @@ // CPsDataPluginInterface::GetAllSupportedDataStoresL // Requests all the supported data stores from data adapters // ---------------------------------------------------------------------------- -void CPsDataPluginInterface::GetAllSupportedDataStoresL(RPointerArray& aDataStores) +void CPsDataPluginInterface::GetAllSupportedDataStoresL(RPointerArray& aDataStores) { PRINT ( _L("Enter CPsDataPluginInterface::GetAllSupportedDataStoresL") ); for ( TInt idx = 0; idx < iPsDataPluginInstances.Count(); idx++ ) - { - iPsDataPluginInstances[idx]->GetSupportedDataStoresL(aDataStores); + { + iPsDataPluginInstances[idx]->GetSupportedDataStoresL(aDataStores); } PRINT ( _L("End CPsDataPluginInterface::GetAllSupportedDataStoresL") ); @@ -228,11 +228,11 @@ for ( TInt i(0); iCompare(aUri) == 0) - { - iPsDataPluginInstances[idx]->GetSupportedDataFieldsL(aDataFields); - break; - } + if ( dataStores[i]->Compare(aUri) == 0 ) + { + iPsDataPluginInstances[idx]->GetSupportedDataFieldsL(aDataFields); + break; + } } CleanupStack::PopAndDestroy( &dataStores ); // Close }