FCL/sf/app/contacts: comparison predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsAlgorithm1.cpp

equal deleted inserted replaced

-:e8e3147d53eb
+:b3431bff8c19
 {
 PRINT ( _L("Enter CPcsAlgorithm1::ConstructL") );
 iCacheStatus = ECachingNotStarted;  // Starting status
 iCacheError = KErrNone;             // No error
-iCacheCount = 0;                    // No data
 iPluginLauncher = CIdle::NewL( CActive::EPriorityStandard );
 // Define cache status property used to inform clients about the caching status.
 TInt err = RProperty::Define(KCStatus,0, RProperty::EInt);
 PRINT1 ( _L("CPcsAlgorithm1::ReplaceZeroWithSpaceL: Query modified (0=not, 1=yes): %d"), queryModified );
 PRINT ( _L("End CPcsAlgorithm1::ReplaceZeroWithSpaceL") );
 return  queryModified;
 }
 // ----------------------------------------------------------------------------
 // CPcsAlgorithm1::PerformSearchL
 // Search function for cache
 // ----------------------------------------------------------------------------
 void  CPcsAlgorithm1::PerformSearchL(const CPsSettings& aSettings,
 CPsQuery& aQuery,
 RPointerArray<CPsClientData>& aSearchResults,
 RPointerArray<CPsPattern>& aSearchSeqs)
 {
 	PRINT ( _L("Enter CPcsAlgorithm1::PerformSearchL") );
 	__LATENCY_MARK ( _L("CPcsAlgorithm1::PerformSearchL") );
 }
 	}
 	// ------------------------------------------------------------------------
 // ------------------ Write result objects to the stream ------------------
-	// Truncate the result set if required
+// Truncate the result set if required
-	TInt numToDisplay = aSettings.MaxResults();
+TInt maxNumToDisplay = aSettings.MaxResults();
-	TInt resultSet = tempSearchResults.Count();
+TInt resultSetCount = tempSearchResults.Count();
+TInt numToDisplay = 0;
-	if( resultSet > numToDisplay && numToDisplay != -1)
+if ( maxNumToDisplay == -1 )
-	{
+{
-		// Copy the top N contents from tempSearchResults to the results stream
+numToDisplay = resultSetCount;
-		for(int i = 0; i < numToDisplay; i++)
+}
-		{
+else
-			aSearchResults.Append(WriteClientDataL(*(tempSearchResults[i])));
+{
-		}
+numToDisplay = Min( maxNumToDisplay, resultSetCount );
-	}
+}
-	else
-	{
+// Copy desired number of results from tempSearchResults to the results stream
-		// Copy all the contents from tempSearchResults to the results stream
+for (TInt i = 0; i < numToDisplay; i++)
-		for(TInt i = 0; i < resultSet; i++)
+{
-		{
+aSearchResults.Append(WriteClientDataL(*(tempSearchResults[i])));
-			aSearchResults.Append(WriteClientDataL(*(tempSearchResults[i])));
+}
-		}
-	}
 	// ------------------------------------------------------------------------
 // Cleanup local results array
 CleanupStack::PopAndDestroy( &tempSearchResultsMod ); // Close, don't destroy
 CleanupStack::PopAndDestroy( &tempSearchResultsIni ); // Close, don't destroy
 * We have to remove from aMatchLocation the occurrence that has a shorter match length.
 * We have to remove the match ("Nik" in this case) even from aMatchSet if there is not
 * any other match for it than the one in "Nik0".
 */
-// --- Remove items from aMatchLocation ---
+// --- Remove duplicate items from aMatchLocation ---
 TInt i = 0;
 TBool incrementFirstCursor;
 while ( i < aMatchLocation.Count() )
 {
 incrementFirstCursor = ETrue;
 {
 i++;
 }
 }
-// --- Remove items from aMatchSet ---
+// --- Remove duplicate items from aMatchSet ---
 HBufC* dataUpper = HBufC::NewLC(aData.Length());
 dataUpper->Des().Copy(aData);
 dataUpper->Des().UpperCase(); // Get uppercase, as aMatchSet is in upper case
 TInt k = 0;
 }
 CleanupStack::PopAndDestroy( dataUpper );
 // ------------------------------------------------------------------------
 // Sort match set
 	iHelper->SortSearchSeqsL(aMatchSet);
 PRINTQUERY    ( _L("CPcsAlgorithm1::SearchInputL: Final: "), aQuery );
 PRINT1        ( _L("CPcsAlgorithm1::SearchInputL: Final: Search Data: %S"), &aData );
 PRINTMATCHSET ( _L("CPcsAlgorithm1::SearchInputL: Final: "), aMatchSet );
 PRINTMATCHLOC ( _L("CPcsAlgorithm1::SearchInputL: Final: "), aMatchLocation );
 	__LATENCY_MARKEND ( _L("CPcsAlgorithm1::SearchInputL") );
 PRINT ( _L("End CPcsAlgorithm1::SearchInputL") );
 }
 // ----------------------------------------------------------------------------
 // CPcsAlgorithm1::SearchMatchStringL
 // Search function for input string, result also as string
 CleanupClosePushL( contactsInGroup );
 RArray<TInt> groupIdArray;
 CleanupClosePushL( groupIdArray );
 // Create a new settings instance
-CPsSettings *tempSettings = aSettings.CloneL();
+CPsSettings* tempSettings = aSettings.CloneL();
 CleanupStack::PushL( tempSettings );
 TBool isGroupSearch = IsGroupSearchL(*tempSettings, groupIdArray);
 if ( isGroupSearch )
 void  CPcsAlgorithm1::DoSearchInputL(CPsQuery& aQuery,
 		                             const TDesC& aData,
 		                             RPointerArray<TDesC>& aMatchSet,
 		                             RArray<TPsMatchLocation>& aMatchLocation )
 {
 PRINT ( _L("Enter CPcsAlgorithm1::DoSearchInputL") );
 TInt queryWords = iMultiSearchHelper->CountMultiQueryWordsL(aQuery);
 // No query
 	PRINT ( _L("CPcsAlgorithm1::DoSearchInputL: Query received is empty") );
 	return;
 }
 RPointerArray<CPsQuery> queryList = iMultiSearchHelper->MultiQueryL(aQuery);
+CleanupResetAndDestroyPushL( queryList );
 PRINTQUERYLIST ( _L("CPcsAlgorithm1::DoSearchInputL: "), queryList );
 if ( queryList.Count() == 1 ) // Single query
 {
 		                                         aMatchSet,
 		                                         aMatchLocation);
 }
 	// Delete all the query elements
-	queryList.ResetAndDestroy();
+	CleanupStack::PopAndDestroy( &queryList ); // ResetAndDestroy
 	PRINT ( _L("End CPcsAlgorithm1::DoSearchInputL") );
 }
 // ----------------------------------------------------------------------------
 // CPcsAlgorithm1::AddData
 // Add a data element to the pool
 // ----------------------------------------------------------------------------
 void CPcsAlgorithm1::AddData(TDesC& aDataStore, CPsData* aData)
 {
 	aData->SetUriId(dataStoreIndex);
 }
 else
 {
-	PRINT(_L("CPcsAlgorithm1::AddDataL Unknown data store"));
+	PRINT(_L("CPcsAlgorithm1::AddData: Unknown data store"));
 	return;
 }
 	TRAPD(err, cache->AddToCacheL(*aData));
 if ( index != -1 )
 {
 	// Already exists
 	return;
 }
 // Create a new cache
 CPcsCache* cache = NULL;
-	TRAPD(err, cache = CPcsCache::NewL(aDataStore, *iKeyMap, iCacheCount));
+	TRAPD(err, cache = CPcsCache::NewL(aDataStore, *iKeyMap, (TUint8) iPcsCache.Count()));
 	if ( err != KErrNone )
 	{
 		SetCachingError(aDataStore, err);
 		return;
 	}
-	// Increment the cachecount
-	iCacheCount++;
 RArray<TInt> dataFields;
 TRAP(err, iPsDataPluginInterface->GetSupportedDataFieldsL(cache->GetURI(), dataFields));
 	if ( err != KErrNone )
 	{
 	}
 cache->SetDataFields(dataFields);
 // Check if sort order is persisted already
 RArray<TInt> sortOrder;
-TRAP(err, ReadSortOrderFromCenRepL(*(cache->GetUri()), sortOrder));
+TRAP(err, ReadSortOrderFromCenRepL(cache->GetURI(), sortOrder));
 if ( err != KErrNone )
 	{
 		SetCachingError(aDataStore, err);
 		return;
 	}
 	if ( cache->GetURI().CompareC(aDataStore) == 0 )
 	{
 		delete iPcsCache[i];
 		iPcsCache.Remove(i);
-		iCacheCount--;
 	}
 }
 }
 // ----------------------------------------------------------------------------
 	if ( ! found )
 	{
 		User::Leave(KErrNotFound);
 	}
-	return *(iPcsCache[i]->GetUri());
+	return iPcsCache[i]->GetURI();
 }
 // ----------------------------------------------------------------------------
 // CPcsAlgorithm1::FindStoreUri
 // Checks if this store exists
 // ----------------------------------------------------------------------------
 TInt CPcsAlgorithm1::FindStoreUri ( const TDesC& aDataStore )
 {
 for ( int i = 0; i < iPcsCache.Count(); i++ )
 {
-	if ( aDataStore.CompareC(*(iPcsCache[i]->GetUri())) == 0 )
+if ( aDataStore.CompareC(iPcsCache[i]->GetURI()) == 0 )
 	{
 	   return i;
 	}
 }
 void CPcsAlgorithm1::SetCachingError(const TDesC& aDataStore, TInt aError)
 {
 	PRINT2 ( _L("SetCachingError::URI %S ERROR %d"), &aDataStore, aError );
 	iCacheError = aError;
-	RProperty::Set( KCStatus,1,iCacheError );
+	RProperty::Set( KCStatus, 1, iCacheError );
 }
 // ----------------------------------------------------------------------------
 // CPcsAlgorithm1::GetAllContentsL
 // Returns all the contents of a store
 TInt arrayIndex = -1;
 if ( CPcsAlgorithm1Utils::IsGroupUri(aURI) )
 {
 // If search in a group uri, use contacts db
-TBuf<255> cntdb(KVPbkDefaultCntDbURI);
+arrayIndex = GetCacheIndex(KVPbkDefaultCntDbURI);
-arrayIndex = GetCacheIndex(cntdb);
 }
 else
 {
 		arrayIndex = GetCacheIndex(aURI);
 }
 void CPcsAlgorithm1::GetSortOrderL ( TDesC& aURI,
 RArray<TInt>& aDataOrder )
 {
 PRINT ( _L("End CPcsAlgorithm1::GetSortOrderL") );
 TInt arrayIndex = -1;
 if ( CPcsAlgorithm1Utils::IsGroupUri(aURI) )
 {
 // If search in a group uri, use contacts db
 TBuf<255> cntdb(KVPbkDefaultCntDbURI);
 arrayIndex = GetCacheIndex(cntdb);
 }
 else
 {
 		arrayIndex = GetCacheIndex(aURI);
 }
 if ( arrayIndex < 0 ) return;
 PRINT ( _L("Enter CPcsAlgorithm1::ChangeSortOrderL.") );
 PRINT ( _L("CPcsAlgorithm1::ChangeSortOrderL. Sort order change received.") );
 PRINT1 ( _L("URI = %S"), &aURI );
 // If URI is search in a group URI return
 if ( CPcsAlgorithm1Utils::IsGroupUri(aURI) )
 {
 PRINT ( _L("CPcsAlgorithm1::ChangeSortOrderL. Sort order change not supported.") );
 return;
 }
 RArray<TInt> mySortOrder;
 cache->GetSortOrder(mySortOrder);
 if ( aSortOrder.Count() == mySortOrder.Count() )
 {
 TBool same = ETrue;
 for ( TInt i = 0; i < mySortOrder.Count(); i++ )
 {
 if ( mySortOrder[i] != aSortOrder[i] )
-		{
+{
-			same = EFalse;
+same = EFalse;
-			break;
+break;
-		}
+}
 }
 if ( same )
 {
 PRINT ( _L("CPcsAlgorithm1::ChangeSortOrderL. Same sort order received. Ignoring ...") );
 PRINT ( _L("End CPcsAlgorithm1::ChangeSortOrderL.") );
 mySortOrder.Reset();
 return;
 }
 }
 mySortOrder.Reset();
 PRINT ( _L("CPcsAlgorithm1::ChangeSortOrderL. New sort order received. Refreshing ...") );
 	{
 		PRINT ( _L("CPcsAlgorithm1::ChangeSortOrderL() Set Caching Error ") );
 		SetCachingError(aURI, err);
 		UpdateCachingStatus(aURI,ECachingCompleteWithErrors);
 		return;
 	}
 	PRINT ( _L("End CPcsAlgorithm1::ChangeSortOrderL.") );
 }
 // ---------------------------------------------------------------------------------

branch	RCL_3
changeset 21	b3431bff8c19
parent 15	e8e3147d53eb
child 35	4ae315f230bc