diff -r 9b022b1f357c -r e0aa398e6810 contentstorage/srvsrc/castorageproxy.cpp --- a/contentstorage/srvsrc/castorageproxy.cpp Tue Jul 06 14:37:10 2010 +0300 +++ b/contentstorage/srvsrc/castorageproxy.cpp Wed Aug 18 10:05:49 2010 +0300 @@ -273,7 +273,7 @@ RPointerArray resultArray; CleanupResetAndDestroyPushL( resultArray ); iStorage->GetEntriesL( touchQuery, resultArray ); - iStorage->TouchL( entryId ); + iStorage->TouchL( entryId, aEntry->GetFlags() & ERemovable ); for( TInt i = 0; i < iHandlerNotifier.Count(); i++ ) { iHandlerNotifier[i]->EntryTouched( entryId ); @@ -363,6 +363,7 @@ RArray parentArray; CleanupClosePushL( parentArray ); parentArray.AppendL( aGroupId ); + iStorage->GetParentsIdsL( parentArray, parentArray ); for( TInt i = 0; i < iHandlerNotifier.Count(); i++ ) { iHandlerNotifier[i]->GroupContentChanged( parentArray ); @@ -370,13 +371,48 @@ CleanupStack::PopAndDestroy( &parentArray ); } +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// #ifdef COVERAGE_MEASUREMENT #pragma CTC SKIP #endif //COVERAGE_MEASUREMENT (calls another method) + +EXPORT_C void CCaStorageProxy::SaveDatabaseL() + { + iStorage->SaveDatabaseL(); + } +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT + + // --------------------------------------------------------------------------- // // --------------------------------------------------------------------------- // +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT (calls another method) + +EXPORT_C void CCaStorageProxy::RestoreDatabaseL() + { + iStorage->RestoreDatabaseL(); + } +#ifdef COVERAGE_MEASUREMENT +#pragma CTC ENDSKIP +#endif //COVERAGE_MEASUREMENT + + +// --------------------------------------------------------------------------- +// +// --------------------------------------------------------------------------- +// +#ifdef COVERAGE_MEASUREMENT +#pragma CTC SKIP +#endif //COVERAGE_MEASUREMENT (calls another method) + EXPORT_C void CCaStorageProxy::LoadDataBaseFromRomL() { iStorage->LoadDataBaseFromRomL();