FCL/sf/mw/searchsrv: comparison harvester/harvesterserver/src/cblacklistdb.cpp

equal deleted inserted replaced

-:671dee74050a
+:6f2c1c46032b
 */
 #include "CBlacklistDb.h"
 #include <HarvesterServerLogger.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "cblacklistdbTraces.h"
+#endif
 _LIT(KBlacklistFileName,"Blacklist.dat");
 //Table name in blacklist database
 _LIT( KBlacklistTableName , "table" );
 // CBlacklistDb::NewL()
 // -----------------------------------------------------------------------------
 //
 CBlacklistDb* CBlacklistDb::NewL()
 {
+OstTraceFunctionEntry0( CBLACKLISTDB_NEWL_ENTRY );
 CPIXLOGSTRING("CBlacklistDb::NewL(): Entered");
 CBlacklistDb* instance = CBlacklistDb::NewLC();
 CleanupStack::Pop( instance );
 CPIXLOGSTRING("CBlacklistDb::NewL(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_NEWL_EXIT );
 return instance;
 }
 // -----------------------------------------------------------------------------
 // CBlacklistDb::NewLC()
 // CBlacklistDb::ConstructL()
 // -----------------------------------------------------------------------------
 //
 void CBlacklistDb::ConstructL()
 {
+OstTraceFunctionEntry0( CBLACKLISTDB_CONSTRUCTL_ENTRY );
 CPIXLOGSTRING("CBlacklistDb::ConstructL(): Entered");
 //Open the sql database.If doesn't exist,create the sql database and open it
 User::LeaveIfError( iFs.Connect() );
 TFileName privatePath;
 TRAPD( error , CreateDBL() );
 if ( error == KErrNone )
 {
 iOpened = ETrue;
+OstTrace0( TRACE_NORMAL, CBLACKLISTDB_CONSTRUCTL, "CBlacklistDb::ConstructL(): Database Opened" );
 CPIXLOGSTRING("CBlacklistDb::ConstructL(): Database Opened");
 }
 }
 break;
 default:
 break;
 }
 CPIXLOGSTRING("CBlacklistDb::ConstructL(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_CONSTRUCTL_EXIT );
 return;
 }
 // -----------------------------------------------------------------------------
 // CBlacklistDb::AddL()
 // -----------------------------------------------------------------------------
 //
 TInt CBlacklistDb::AddL( TInt32 aPluginUid , TInt aVersion )
 {
+OstTraceFunctionEntry0( CBLACKLISTDB_ADDL_ENTRY );
 //Add the item record to database
+OstTraceExt2( TRACE_NORMAL, CBLACKLISTDB_ADDL, "CBlacklistDb::AddL;Uid=%x;Version=%d", aPluginUid, aVersion );
 CPIXLOGSTRING3("CBlacklistDb::AddL(): Uid = %x and Version = %d" , aPluginUid , aVersion);
 if ( !iOpened )
 return KErrNotReady;
 }
 }
 CleanupStack::PopAndDestroy( &dbView ); // dbView/
 User::LeaveIfError( iDatabase.Compact() );
 CPIXLOGSTRING("CBlacklistDb::AddL(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_ADDL_EXIT );
 return err;
 }
 // -----------------------------------------------------------------------------
 // CBlacklistDb::RemoveL()
 // -----------------------------------------------------------------------------
 //
 void CBlacklistDb::Remove( TInt32 aPluginUid )
 {
+OstTraceFunctionEntry0( CBLACKLISTDB_REMOVE_ENTRY );
+OstTrace1( TRACE_NORMAL, CBLACKLISTDB_REMOVE, "CBlacklistDb::Remove;Uid=%x", aPluginUid );
 CPIXLOGSTRING2("CBlacklistDb::RemoveL(): Uid = %x " , aPluginUid);
 if ( !iOpened )
 return;
 //delete the row.
 TInt rowCount( iDatabase.Execute(sql) );
 if(rowCount > 0)
 {
+OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTDB_REMOVE, "CBlacklistDb::RemoveL(): Removed UID succesfully" );
 CPIXLOGSTRING("CBlacklistDb::RemoveL(): Removed UID succesfully");
 }
 else
 {
+OstTrace0( TRACE_NORMAL, DUP2_CBLACKLISTDB_REMOVE, "CBlacklistDb::RemoveL(): UID not found" );
 CPIXLOGSTRING("CBlacklistDb::RemoveL(): UID not found");
 }
 CPIXLOGSTRING("CBlacklistDb::RemoveL(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_REMOVE_EXIT );
 return ;
 }
 // -----------------------------------------------------------------------------
 // CBlacklistDb::iSAvailableL()
 // -----------------------------------------------------------------------------
 //
 TBool CBlacklistDb::FindWithVersionL( TInt32 aPluginUid , TInt aVersion )
 {
+OstTraceExt2( TRACE_NORMAL, CBLACKLISTDB_FINDWITHVERSIONL, "CBlacklistDb::FindWithVersionL;Uid=%x;Version=%d", aPluginUid, aVersion );
 CPIXLOGSTRING3("CBlacklistDb::FindWithVersionL(): Uid = %x and Version = %d" , aPluginUid , aVersion);
 if ( !iOpened )
 return EFalse;
 CDbColSet* colSet = dbView.ColSetL();
 TDbColNo versioncolno = colSet->ColNo(Kversion);
 TInt version = dbView.ColInt32( versioncolno );
 if ( version == aVersion)
 {
+OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTDB_FINDWITHVERSIONL, "CBlacklistDb::FindWithVersionL(): UID found" );
 CPIXLOGSTRING("CBlacklistDb::FindWithVersionL(): UID found");
 found = ETrue;
 }
 }
 CleanupStack::PopAndDestroy( &dbView ); // dbView/
 // CBlacklistDb::UpdateL
 // -----------------------------------------------------------------------------
 //
 TInt CBlacklistDb::UpdateL( TInt32 aPluginUid , TInt aVersion )
 	{
+	OstTraceFunctionEntry0( CBLACKLISTDB_UPDATEL_ENTRY );
 	//Add the item record to database
+OstTraceExt2( TRACE_NORMAL, CBLACKLISTDB_UPDATEL, "CBlacklistDb::UpdateL;Uid=%x;Version=%d", aPluginUid, aVersion );
 CPIXLOGSTRING3("CBlacklistDb::UpdateL(): Uid = %x and Version = %d" , aPluginUid , aVersion);
 if ( !iOpened )
 return KErrNotReady;
 }
 CleanupStack::PopAndDestroy( &dbView ); // dbView/
 User::LeaveIfError( iDatabase.Compact() );
 CPIXLOGSTRING("CBlacklistDb::UpdateL(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_UPDATEL_EXIT );
 return KErrNone;
 	}
 // -----------------------------------------------------------------------------
 // CBlacklistDb::FindL
 // -----------------------------------------------------------------------------
 //
 TBool CBlacklistDb::FindL(TInt32 aPluginUid)
 	{
+	OstTrace1( TRACE_NORMAL, CBLACKLISTDB_FINDL, "CBlacklistDb::FindL;Uid=%x", aPluginUid );
 	CPIXLOGSTRING2("CBlacklistDb::FindL(): Uid = %x " , aPluginUid );
 	if ( !iOpened )
 	        return EFalse;
 TInt isAtRow( dbView.FirstL() );
 if ( isAtRow )
 {
+		OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTDB_FINDL, "CBlacklistDb::FindL(): UID found" );
 		CPIXLOGSTRING("CBlacklistDb::FindL(): UID found");
 		found = ETrue;
 }
 CleanupStack::PopAndDestroy( &dbView ); // dbView/
 return found;
 // CBlacklistDb::CreateDBL
 // -----------------------------------------------------------------------------
 //
 void CBlacklistDb::CreateDBL()
 {
+OstTraceFunctionEntry0( CBLACKLISTDB_CREATEDBL_ENTRY );
 CPIXLOGSTRING("CBlacklistDb::CreateDBL(): Enter");
 iDatabase.Close();
 TFileName privatePath;
 User::LeaveIfError( iDatabase.CreateTable( KBlacklistTableName , *columns ) );
 //clean up of variables (columns and dataFile)
 CleanupStack::PopAndDestroy( columns );
 CPIXLOGSTRING("CBlacklistDb::CreateDBL(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_CREATEDBL_EXIT );
 }
 // -----------------------------------------------------------------------------
 // CBlacklistDb::CreateColumnSetLC
 // -----------------------------------------------------------------------------
 //
 CDbColSet* CBlacklistDb::CreateColumnSetLC()
 {
+OstTraceFunctionEntry0( CBLACKLISTDB_CREATECOLUMNSETLC_ENTRY );
 CPIXLOGSTRING("CBlacklistDb::CreateColumnSetLC(): Enter");
 CDbColSet* columns = CDbColSet::NewLC();
 //Add uid column
 col.iAttributes = TDbCol::ENotNull;
 columns->AddL( col );
 CPIXLOGSTRING("CBlacklistDb::CreateColumnSetLC(): Exit");
+OstTraceFunctionExit0( CBLACKLISTDB_CREATECOLUMNSETLC_EXIT );
 return columns; // columns stays on CleanupStack
 }

changeset 1	6f2c1c46032b
parent 0	671dee74050a
child 7	a5fbfefd615f