diff -r 9f21bab39f42 -r 4a4892eec172 mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/src/HarvesterClientTestScripterBlocks.cpp --- a/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/src/HarvesterClientTestScripterBlocks.cpp Tue May 11 16:36:55 2010 +0300 +++ b/mds_plat/harvester_framework_api/tsrc/HarvesterClientTest/src/HarvesterClientTestScripterBlocks.cpp Tue May 25 13:10:05 2010 +0300 @@ -552,21 +552,8 @@ User::LeaveIfError( aItem.GetNextString( inputFile )); TUint32 mediaId( 0 ); -// TInt blackListError( KErrNone ); TTime modified ( 0 ); -/* - blackListError = iMediaIdUtil->GetMediaId( inputFile, mediaId ); - if( blackListError != KErrNone ) - { - return blackListError; - } - - blackListError = iFs.Modified( inputFile, modified ); - if( blackListError != KErrNone ) - { - return blackListError; - } -*/ + TRAPD( err, iBlacklistClient.AddL( inputFile, mediaId, modified ) ); if( err != KErrNone ) { @@ -590,27 +577,12 @@ iLog->Log( KMsg1 ); RDebug::Print( KMsg1 ); -// iBlacklistClient.LoadBlacklistL(); - TPtrC inputFile; User::LeaveIfError( aItem.GetNextString( inputFile )); TUint32 mediaId( 0 ); -// TInt blackListError( KErrNone ); TTime modified ( 0 ); -/* - blackListError = iMediaIdUtil->GetMediaId( inputFile, mediaId ); - if( blackListError != KErrNone ) - { - return blackListError; - } - - blackListError = iFs.Modified( inputFile, modified ); - if( blackListError != KErrNone ) - { - return blackListError; - } -*/ + TBool isBlacklisted( EFalse ); TRAP_IGNORE( isBlacklisted = iBlacklistClient.IsBlacklistedL( inputFile, mediaId, modified ) ); if( !isBlacklisted ) @@ -639,15 +611,8 @@ User::LeaveIfError( aItem.GetNextString( inputFile )); TUint32 mediaId( 0 ); -// TInt blackListError( KErrNone ); TTime modified ( 0 ); -/* - blackListError = iMediaIdUtil->GetMediaId( inputFile, mediaId ); - if( blackListError != KErrNone ) - { - return blackListError; - } -*/ + TRAPD( err, iBlacklistClient.RemoveL( inputFile, mediaId ) ); if( err != KErrNone ) {