FCL/sf/app/search: comparison harvesterplugins/contacts/src/ccontactsplugin.cpp

equal deleted inserted replaced

-:1abfa342db42
+:367228f82b66
 	delete iDatabase;
 	delete iIndexer;
 	//delete NULL is safe - so no need to test nullity of iExceprt (which routinely
 	//keeps getting deleted in the plugin).
 	delete iExcerpt;
-#ifdef USE_HIGHLIGHTER
+	iJobQueue.Reset();
+	iJobQueue.Close();
+//#ifdef USE_HIGHLIGHTER
 if(iHLDisplayExcerpt)
 {
 delete iHLDisplayExcerpt;
 iHLDisplayExcerpt = NULL;
 }
-#endif
+//#endif
 	}
 // -----------------------------------------------------------------------------
 // CContactsPlugin::ConstructL()
 // -----------------------------------------------------------------------------
 //
 void CContactsPlugin::ConstructL()
 	{
 	iDatabase = CContactDatabase::OpenL();
+iIndexState = ETrue;
 	// This pointer is valid until a change is made to the database or until
 	// the database's active object is allowed to run. If the array is
 	// required after one of the above two events has occurred, a copy of the
 	// array must first be made.
 	iContacts = iDatabase->SortedItemsL();
 // -----------------------------------------------------------------------------
 // CContactsPlugin::StartPluginL()
 // -----------------------------------------------------------------------------
 //
 void CContactsPlugin::StartPluginL()
 	{
 	// Define this base application class, use default location
 	User::LeaveIfError(iSearchSession.DefineVolume( _L(CONTACT_QBASEAPPCLASS), KNullDesC ));
 	// Open database
 	iIndexer = CCPixIndexer::NewL(iSearchSession);
 // -----------------------------------------------------------------------------
 //
 void CContactsPlugin::StartHarvestingL(const TDesC& /*aQualifiedBaseAppClass*/)
 {
 	iIndexer->ResetL();
 	iCurrentIndex = 0;
+	iHarvestState = EHarvesterStartHarvest;
 #ifdef __PERFORMANCE_DATA
 iStartTime.UniversalTime();
 #endif
 iAsynchronizer->Start( 0, this, KHarvestingDelay );
 }
 // CContactsPlugin::HandleDatabaseEventL
 // -----------------------------------------------------------------------------
 //
 void CContactsPlugin::HandleDatabaseEventL(TContactDbObserverEvent aEvent)
 	{
+TRecord entry;
+entry.iContactId = aEvent.iContactId;
 	switch( aEvent.iType )
 		{
 		case EContactDbObserverEventContactChanged:
 		case EContactDbObserverEventGroupChanged:
 		case EContactDbObserverEventOwnCardChanged:
 #ifdef __PERFORMANCE_DATA
 iStartTime.UniversalTime();
 CreateContactIndexItemL(aEvent.iContactId, ECPixUpdateAction);
 UpdatePerformaceDataL(ECPixUpdateAction);
 #else
-			CreateContactIndexItemL(aEvent.iContactId, ECPixUpdateAction);
+			entry.iActionType = ECPixUpdateAction;
+			//CreateContactIndexItemL(aEvent.iContactId, ECPixUpdateAction);
 #endif
 			break;
 		case EContactDbObserverEventContactDeleted:
 		case EContactDbObserverEventGroupDeleted:
 #ifdef __PERFORMANCE_DATA
 iStartTime.UniversalTime();
 			CreateContactIndexItemL(aEvent.iContactId, ECPixRemoveAction);
 			UpdatePerformaceDataL(ECPixRemoveAction);
 #else
-			CreateContactIndexItemL(aEvent.iContactId, ECPixRemoveAction);
+			entry.iActionType = ECPixRemoveAction;
+			//CreateContactIndexItemL(aEvent.iContactId, ECPixRemoveAction);
 #endif
 			break;
 		case EContactDbObserverEventContactAdded:
 		case EContactDbObserverEventGroupAdded:
 #ifdef __PERFORMANCE_DATA
 iStartTime.UniversalTime();
 			CreateContactIndexItemL(aEvent.iContactId, ECPixUpdateAction);
 			UpdatePerformaceDataL(ECPixUpdateAction);
 #else
-			CreateContactIndexItemL(aEvent.iContactId, ECPixAddAction);
+			entry.iActionType = ECPixAddAction;
+			//CreateContactIndexItemL(aEvent.iContactId, ECPixAddAction);
 #endif
 			break;
 		default:
 			// Ignore other events
 			break;
 		}
+if( iIndexState )
+CreateContactIndexItemL(aEvent.iContactId, entry.iActionType);
+else
+OverWriteOrAddToQueueL(entry);
 	}
 // -----------------------------------------------------------------------------
 // CContactsPlugin::DelayedCallbackL
 // -----------------------------------------------------------------------------
 //
 void CContactsPlugin::DelayedCallbackL( TInt /*aCode*/ )
 {
 	if (!iContacts || !iObserver)
 		return;
-	// may have changed - refresh the pointer
+	if(!iIndexState)
-	iContacts = iDatabase->SortedItemsL();
+	    return;
-	// Read the next set of contacts.
+// may have changed - refresh the pointer
-	for( TInt i = 0; i < KContactsPerRunL; i++ )
+iContacts = iDatabase->SortedItemsL();
-		{
-		// Exit the loop if no more contacts
+// Read the next set of contacts.
-		if (iCurrentIndex >= iContacts->Count())
+for( TInt i = 0; i < KContactsPerRunL; i++ )
-			break;
+{
+// Exit the loop if no more contacts
-		// Create index item
+if (iCurrentIndex >= iContacts->Count())
-		OstTrace1( TRACE_NORMAL, CCONTACTSPLUGIN_DELAYEDCALLBACKL, "CContactsPlugin::DelayedCallbackL();Harvesting id=%d", (*iContacts)[iCurrentIndex] );
+break;
-		CPIXLOGSTRING2("CContactsPlugin::DelayedCallbackL(): Harvesting id=%d.", (*iContacts)[iCurrentIndex]);
-		CreateContactIndexItemL((*iContacts)[iCurrentIndex], ECPixAddAction);
+// Create index item
-		iCurrentIndex++;
+OstTrace1( TRACE_NORMAL, CCONTACTSPLUGIN_DELAYEDCALLBACKL, "CContactsPlugin::DelayedCallbackL();Harvesting id=%d", (*iContacts)[iCurrentIndex] );
-		}
+CPIXLOGSTRING2("CContactsPlugin::DelayedCallbackL(): Harvesting id=%d.", (*iContacts)[iCurrentIndex]);
+CreateContactIndexItemL((*iContacts)[iCurrentIndex], ECPixAddAction);
-	if( iAsynchronizer && (iCurrentIndex < iContacts->Count()) )
+iCurrentIndex++;
-	    {
+}
-	    // Launch the next RunL
+if( iAsynchronizer && (iCurrentIndex < iContacts->Count()) )
+{
+// Launch the next RunL
 iAsynchronizer->Start(0, this, KHarvestingDelay);
 }
-	else
+else
-		{
+{
-		// Harvesting was successfully completed
+// Harvesting was successfully completed
-		Flush(*iIndexer);
+Flush(*iIndexer);
 #ifdef __PERFORMANCE_DATA
 UpdatePerformaceDataL();
 #endif
-		iObserver->HarvestingCompleted(this, iIndexer->GetBaseAppClass(), KErrNone);
+//On Harvesting completion mark status as Idle
-		}
+iHarvestState = EHarvesterIdleState;
+iObserver->HarvestingCompleted(this, iIndexer->GetBaseAppClass(), KErrNone);
+}
 	}
 void CContactsPlugin::DelayedError(TInt aError)
 	{
 	// Harvesting was successfully completed
 	Flush(*iIndexer);
+	iHarvestState = EHarvesterIdleState;
 	iObserver->HarvestingCompleted(this, iIndexer->GetBaseAppClass(), aError);
 	}
 // ---------------------------------------------------------------------------
 // CContactsPlugin::AddFieldL
 	{
 	// Find field
 	TInt findpos = aFieldSet.Find( aFieldId );
 	if (! (findpos < 0) || (findpos >= aFieldSet.Count() ) )
 		{
 		CContactItemField& additionalField = aFieldSet[ findpos ];
-		TInt newfieldsize = 0;
 		if( additionalField.StorageType() == KStorageTypeDateTime)
 		            {
 		            CContactDateField* fieldDate = additionalField.DateTimeStorage();
 		            if (fieldDate)
 		                {
 	if (!iIndexer)
 	return;
 	OstTrace1( TRACE_NORMAL, CCONTACTSPLUGIN_CREATECONTACTINDEXITEML, "CContactsPlugin::CreateContactIndexItemL();aContentId=%d", aContentId );
 	CPIXLOGSTRING2("CContactsPlugin::CreateContactIndexItemL(): aContentId = %d ", aContentId );
+OstTrace0( TRACE_NORMAL, DUP8_CCONTACTSPLUGIN_CREATECONTACTINDEXITEML, "CContactsPlugin::Indexing Contact" );
 	// creating CSearchDocument object with unique ID for this application
 	TBuf<20> docid_str;
 	TBuf<2> isGroup;
 	docid_str.AppendNum(aContentId);
 isGroup.AppendNum(ETrue);
 index_item->AddFieldL( KContactIsGroup, isGroup, CDocumentField::EStoreYes | CDocumentField::EIndexNo );
 index_item->AddFieldL( KContactsGivenNameField, static_cast<CContactGroup*>( contact )->GetGroupLabelL(), CDocumentField::EStoreYes | CDocumentField::EIndexTokenized );
 OstTraceExt1( TRACE_NORMAL, DUP1_CCONTACTSPLUGIN_CREATECONTACTINDEXITEML, ";Adding Contact Group=%S", ( static_cast<CContactGroup*>( contact )->GetGroupLabelL() ) );
 CPIXLOGSTRING2("Adding Contact Group %S", &( static_cast<CContactGroup*>( contact )->GetGroupLabelL() ) );
-#ifdef USE_HIGHLIGHTER
+//#ifdef USE_HIGHLIGHTER
 index_item->AddHLDisplayFieldL(static_cast<CContactGroup*>( contact )->GetGroupLabelL());
-#else
+//#else
-index_item->AddExcerptL( static_cast<CContactGroup*>( contact )->GetGroupLabelL() );
+//            index_item->AddExcerptL( static_cast<CContactGroup*>( contact )->GetGroupLabelL() );
-#endif
+//#endif
 		    }
 		else//If the contact item is a regular contact.
 		    {
 if (iExcerpt)
 {
 * is the order of fields shown when you 'Edit' the contact.
 */
 AddFieldL( *index_item, fieldSet, KUidContactFieldGivenName, KContactsGivenNameField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText );
 AddFieldL( *index_item, fieldSet, KUidContactFieldFamilyName, KContactsFamilyNameField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField:: EIndexFreeText );
-#ifdef USE_HIGHLIGHTER
+//#ifdef USE_HIGHLIGHTER
 if(iHLDisplayExcerpt)
 {
 delete iHLDisplayExcerpt;
 iHLDisplayExcerpt = NULL;
 }
 AddFieldToHLExcerptL( fieldSet, KUidContactFieldGivenName);
 AddFieldToHLExcerptL( fieldSet, KUidContactFieldFamilyName);
 if(iHLDisplayExcerpt)
 index_item->AddHLDisplayFieldL(*iHLDisplayExcerpt);
-#endif
+//#endif
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldPhoneNumber, KContactsPhoneNumberField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexPhoneNumber );
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldEMail, KContactsEMailField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText );
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldSIPID, KContactsSIPIDField );
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldCompanyName, KContactsCompanyNameField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText );
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldJobTitle, KContactsJobTitleField, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText );
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldAssistant, KContactAssistant, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText);
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldDepartmentName, KContactsDepartmentName, CDocumentField::EStoreYes | CDocumentField::EIndexTokenized | CDocumentField::EIndexFreeText);
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldIMAddress, KContactIMAddress);
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldServiceProvider, KContactServiceProvider);
-#ifdef USE_HIGHLIGHTER
+//#ifdef USE_HIGHLIGHTER
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldBirthday, KContactBirthday);
 AddFieldToDocumentAndExcerptL( *index_item, fieldSet, KUidContactFieldAnniversary, KContactAnniversary);
-#else
+//#else
-AddFieldL( *index_item, fieldSet, KUidContactFieldBirthday, KContactBirthday);
+//            AddFieldL( *index_item, fieldSet, KUidContactFieldBirthday, KContactBirthday);
-AddFieldL( *index_item, fieldSet, KUidContactFieldAnniversary, KContactAnniversary);
+//            AddFieldL( *index_item, fieldSet, KUidContactFieldAnniversary, KContactAnniversary);
-#endif
+//#endif
 index_item->AddExcerptL(*iExcerpt);
 }
 	index_item->AddFieldL(KMimeTypeField, KMimeTypeContact, CDocumentField::EStoreYes | CDocumentField::EIndexUnTokenized);
 			CPIXLOGSTRING2("CContactsPlugin::CreateContactIndexItemL(): Error %d in deleting.", err);
 			}
 		}
 }
-#ifdef USE_HIGHLIGHTER
+//#ifdef USE_HIGHLIGHTER
 void CContactsPlugin::AddFieldToHLExcerptL( CContactItemFieldSet& aFieldSet, TUid aFieldId)
 {
 if(!iHLDisplayExcerpt)
 {
 iHLDisplayExcerpt = HBufC::NewL(2);
 TInt findpos = aFieldSet.Find(aFieldId);
 if (! (findpos < 0) || (findpos >= aFieldSet.Count() ) )
 {
 CContactItemField& additionalField = aFieldSet[findpos];
 CContactTextField* fieldText = additionalField.TextStorage();
 if (fieldText && fieldText->Text() != KNullDesC)//value is not Null
 {
 TInt currentSize = iHLDisplayExcerpt->Size();
 TInt newSize = currentSize + fieldText->Text().Length() + 1;
 ptr.Append(KExcerptDelimiter);
 }
 }
 }
-#endif
+//#endif
 // ---------------------------------------------------------------------------
 // CContactsPlugin::GetDateL
 // ---------------------------------------------------------------------------
 //
 time.FormatL(aDateString, KTimeFormat);
 }
 }
 }
+void CContactsPlugin::PausePluginL()
+{
+OstTraceFunctionEntry0( CCONTACTSPLUGIN_PAUSEPLUGINL_ENTRY );
+iIndexState = EFalse;
+OstTraceFunctionExit0( CCONTACTSPLUGIN_PAUSEPLUGINL_EXIT );
+}
+void CContactsPlugin::ResumePluginL()
+{
+OstTraceFunctionEntry0( CCONTACTSPLUGIN_RESUMEPLUGINL_ENTRY );
+iIndexState = ETrue;
+if(iHarvestState == EHarvesterStartHarvest)
+{
+if(iAsynchronizer->CallbackPending())
+iAsynchronizer->CancelCallback();
+iAsynchronizer->Start( 0, this, KHarvestingDelay );
+}
+else
+{
+IndexQueuedItems();
+}
+OstTraceFunctionExit0( CCONTACTSPLUGIN_RESUMEPLUGINL_EXIT );
+}
+void CContactsPlugin::OverWriteOrAddToQueueL(TRecord& aEntry)
+{
+OstTraceFunctionEntry0( CCONTACTSPLUGIN_OVERWRITEORADDTOQUEUEL_ENTRY );
+for (TInt i=0; i<iJobQueue.Count(); i++)
+{
+if (iJobQueue[i].iContactId == aEntry.iContactId)
+{
+// Older version found
+iJobQueue[i] = aEntry;
+OstTraceFunctionExit0( CCONTACTSPLUGIN_OVERWRITEORADDTOQUEUEL_EXIT );
+return;
+}
+}
+// older not found, append
+iJobQueue.AppendL(aEntry);
+OstTraceFunctionExit0( DUP1_CCONTACTSPLUGIN_OVERWRITEORADDTOQUEUEL_EXIT );
+}
+void CContactsPlugin::IndexQueuedItems()
+{
+OstTraceFunctionEntry0( CCONTACTSPLUGIN_INDEXQUEUEDITEMS_ENTRY );
+while (iJobQueue.Count()>0)
+{
+TRecord entry = iJobQueue[0];
+//Let the indexer handle this object TRAP it as it can leave
+TRAPD(err,CreateContactIndexItemL( entry.iContactId, entry.iActionType ));
+if(KErrNone == err)
+{
+iJobQueue.Remove(0);
+}
+}
+OstTraceFunctionExit0( CCONTACTSPLUGIN_INDEXQUEUEDITEMS_EXIT );
+}
 // ---------------------------------------------------------------------------
 // CContactsPlugin::UpdatePerformaceDataL
 // ---------------------------------------------------------------------------
 //
 #ifdef __PERFORMANCE_DATA

changeset 26	367228f82b66
parent 21	708468d5143e
child 27	7a8855317cbd