MCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp

equal deleted inserted replaced

-:2eb74cf6572e
+:7403edfcf0fb
 // Destructor.
 // ---------------------------------------------------------------------------
 //
 CThumbnailStore::~CThumbnailStore()
 {
-TN_DEBUG1( "CThumbnailStore::~CThumbnailStore()" );
+TN_DEBUG2( "CThumbnailStore::~CThumbnailStore() drive: %d", iDrive );
 if(iActivityManager)
 {
 delete iActivityManager;
 iActivityManager = NULL;
 // CThumbnailStore::CThumbnailStore()
 // C++ default constructor can NOT contain any code, that might leave.
 // ---------------------------------------------------------------------------
 //
 CThumbnailStore::CThumbnailStore( RFs& aFs, TInt aDrive, TDesC& aImei,  CThumbnailServer* aServer ):
-iFs( aFs ), iDrive( aDrive ), iBatchItemCount(0), iImei(aImei), iServer(aServer), iDiskFull(EFalse)
+iFs( aFs ), iDrive( aDrive ), iDriveChar( 0 ), iBatchItemCount(0), iImei(aImei),
+iServer(aServer), iDiskFull(EFalse)
 {
 // no implementation required
 }
 TN_DEBUG1( "CThumbnailStore::ConstructL()" );
 #ifdef _DEBUG
 iThumbCounter = 0;
 #endif
+HBufC* databasePath = HBufC::NewLC( KMaxFileName );
+TPtr pathPtr = databasePath->Des();
+User::LeaveIfError( RFs::DriveToChar( iDrive, iDriveChar ));
+pathPtr.Append( iDriveChar );
+pathPtr.Append( KThumbnailDatabaseName );
+	//start disk space monitor
+iDiskFullNotifier = CThumbnailStoreDiskSpaceNotifierAO::NewL( *this,
+KDiskFullThreshold,
+pathPtr );
+CleanupStack::PopAndDestroy( databasePath );
+TN_DEBUG2( "CThumbnailStore::ConstructL() drive: %d", iDrive );
+OpenDatabaseL();
+// to monitor device activity
+iActivityManager = CTMActivityManager::NewL( this, KStoreMaintenanceIdle);
+iActivityManager->Start();
+// once in every mount
+iDeleteThumbs = ETrue;
+iCheckFilesExist = ETrue;
+iLastCheckedRowID = -1;
+}
+// ---------------------------------------------------------------------------
+// OpenDatabaseL database file
+// ---------------------------------------------------------------------------
+TInt CThumbnailStore::OpenDatabaseFileL()
+{
+TN_DEBUG1( "CThumbnailStore::OpenDatabaseFile()" );
 HBufC* databasePath = HBufC::NewLC( KMaxFileName );
 TPtr pathPtr = databasePath->Des();
 TChar driveChar = 0;
 User::LeaveIfError( RFs::DriveToChar( iDrive, driveChar ));
 pathPtr.Append( driveChar );
 pathPtr.Append( KThumbnailDatabaseName );
-	//start disk space monitor
-iDiskFullNotifier = CThumbnailStoreDiskSpaceNotifierAO::NewL( *this,
-KDiskFullThreshold,
-pathPtr );
-CleanupStack::PopAndDestroy( databasePath );
-OpenDatabaseL();
-// to monitor device activity
-iActivityManager = CTMActivityManager::NewL( this, KStoreMaintenanceIdle);
-iActivityManager->Start();
-// once in every mount
-iDeleteThumbs = ETrue;
-iCheckFilesExist = ETrue;
-iLastCheckedRowID = -1;
-}
-// ---------------------------------------------------------------------------
-// OpenDatabaseL database file
-// ---------------------------------------------------------------------------
-TInt CThumbnailStore::OpenDatabaseFileL()
-{
-TN_DEBUG1( "CThumbnailStore::OpenDatabaseFile()" );
-HBufC* databasePath = HBufC::NewLC( KMaxFileName );
-TPtr pathPtr = databasePath->Des();
-TChar driveChar = 0;
-User::LeaveIfError( RFs::DriveToChar( iDrive, driveChar ));
-pathPtr.Append( driveChar );
-pathPtr.Append( KThumbnailDatabaseName );
 TInt ret = iDatabase.Open( pathPtr );
 CleanupStack::PopAndDestroy( databasePath );
 return ret;
 }
 // ---------------------------------------------------------------------------
 // OpenDatabaseL database
 // ---------------------------------------------------------------------------
 TInt CThumbnailStore::OpenDatabaseL()
 {
-TN_DEBUG1( "CThumbnailStore::OpenDatabaseL()" );
+TN_DEBUG2( "CThumbnailStore::OpenDatabaseL() drive: %d", iDrive );
 iDatabase.Close();
 TBool newDatabase(EFalse);
 TInt error = KErrNone;
 TInt err = OpenDatabaseFileL();
-if ( err == KErrNotFound )
+TN_DEBUG2( "CThumbnailStore::OpenDatabaseL() -- err = %d", err);
-{
-// db not found, create new
+if ( err == KErrNotFound )
-RecreateDatabaseL( EFalse);
+{
-newDatabase = ETrue;
+// db not found, create new
-err = KErrNone;
+RecreateDatabaseL( EFalse);
-}
+newDatabase = ETrue;
-else if ( err == KErrNone)
+err = KErrNone;
-{
+}
-// db found, check version and rowids
+else if ( err == KErrNone)
-error = CheckVersionL();
+{
-if(error == KErrNone)
+// db found, check version and rowids
-{
+error = CheckVersionL();
-error = CheckRowIDsL();
+if(error == KErrNone)
-}
+{
-}
+error = CheckRowIDsL();
+}
+}
-TN_DEBUG3( "CThumbnailStore::ConstructL() -- error = %d, err = %d", error, err);
+TN_DEBUG2( "CThumbnailStore::OpenDatabaseL() -- error = %d", error);
 // if wrong version, corrupted database or other error opening db
 if ( error == KErrNotSupported || (err != KErrNone && err != KErrNotFound) )
 {
 RecreateDatabaseL( ETrue);
 // add tables
 TRAPD(tableError, CreateTablesL() );
 if(!tableError)
 {
 TRAPD(err, AddVersionAndImeiL());
 if (err == KSqlErrCorrupt)
 {
 RecreateDatabaseL( ETrue);
 }
 User::LeaveIfError(err);
 }
 err = iDatabase.Exec( KThumbnailCreateTempInfoTable );
-#ifdef _DEBUG
-if(err < 0)
+#ifdef _DEBUG
-{
+if(err < 0)
-TPtrC errorMsg = iDatabase.LastErrorMessage();
+{
-TN_DEBUG2( "CThumbnailStore::ConstructL() KThumbnailCreateTempInfoTable %S" , &errorMsg);
+TPtrC errorMsg = iDatabase.LastErrorMessage();
-}
+TN_DEBUG2( "CThumbnailStore::PrepareDbL() KThumbnailCreateTempInfoTable %S" , &errorMsg);
+}
 #endif
 User::LeaveIfError( err );
 err = iDatabase.Exec( KThumbnailCreateTempInfoDataTable );
-#ifdef _DEBUG
-if(err < 0)
+#ifdef _DEBUG
-{
+if(err < 0)
-TPtrC errorMsg = iDatabase.LastErrorMessage();
+{
-TN_DEBUG2( "CThumbnailStore::ConstructL() KThumbnailCreateTempInfoDataTable %S" , &errorMsg);
+TPtrC errorMsg = iDatabase.LastErrorMessage();
-}
+TN_DEBUG2( "CThumbnailStore::PrepareDbL() KThumbnailCreateTempInfoDataTable %S" , &errorMsg);
+}
 #endif
-User::LeaveIfError( err );
+User::LeaveIfError( err );
 }
 // ---------------------------------------------------------------------------
 // Create database tables
 // ---------------------------------------------------------------------------
 User::LeaveIfError( err );
 }
 void CThumbnailStore::RecreateDatabaseL(const TBool aDelete)
 {
-TN_DEBUG1( "CThumbnailStore::RecreateDatabaseL()" );
+TN_DEBUG2( "CThumbnailStore::RecreateDatabaseL() drive: %d", iDrive );
 TVolumeInfo volumeinfo;
 iFs.Volume(volumeinfo, iDrive);
 TUint id = volumeinfo.iUniqueID;
 TBuf<50> mediaid;
 mediaid.Num(id);
 // delete db and create new
 iDatabase.Close();
+TN_DEBUG1( "CThumbnailStore::RecreateDatabaseL() database closed" );
 HBufC* databasePath = HBufC::NewLC( KMaxFileName );
 TPtr pathPtr = databasePath->Des();
-TChar driveChar = 0;
+User::LeaveIfError( RFs::DriveToChar( iDrive, iDriveChar ));
-User::LeaveIfError( RFs::DriveToChar( iDrive, driveChar ));
+pathPtr.Append( iDriveChar );
-pathPtr.Append( driveChar );
 pathPtr.Append( KThumbnailDatabaseName );
 TInt err(KErrNone);
 if(aDelete)
 {
-iDatabase.Delete(pathPtr);
+TN_DEBUG1( "CThumbnailStore::RecreateDatabaseL() delete database" );
+TInt del = iDatabase.Delete(pathPtr);
+TN_DEBUG2( "CThumbnailStore::RecreateDatabaseL() deleted database, err: %d", del );
 }
 const TDesC8& config = KThumbnailSqlConfig;
 RSqlSecurityPolicy securityPolicy;
 CleanupClosePushL( securityPolicy );
-securityPolicy.Create( KThumbnailDatabaseSecurityPolicy );
+securityPolicy.CreateL( KThumbnailDatabaseSecurityPolicy );
+TN_DEBUG1( "CThumbnailStore::RecreateDatabaseL() create new" );
 TRAP(err, iDatabase.CreateL( pathPtr, securityPolicy, &config ));
+TN_DEBUG2( "CThumbnailStore::RecreateDatabaseL() -- database created err = %d", err );
 CleanupStack::PopAndDestroy( &securityPolicy );
+CleanupStack::PopAndDestroy( databasePath );
-#ifdef _DEBUG
-if(err < 0)
-{
-TPtrC errorMsg = iDatabase.LastErrorMessage();
-TN_DEBUG2( "CThumbnailStore::RecreateDatabaseL() KThumbnailInsertTempThumbnailInfoData %S" , &errorMsg);
-}
-#endif
-TN_DEBUG2( "CThumbnailStore::RecreateDatabaseL() -- database created err = %d", err );
 User::LeaveIfError( err );
-CleanupStack::PopAndDestroy( databasePath );
 RFile64 file;
 file.Create(iFs, mediaid, EFileShareReadersOrWriters );
 file.Close();
 {
 timeStamp = aModified;
 }
 else
 {
+TInt timeErr = KErrNone;
 if (aPath.Length())
 {
-iFs.Modified(aPath, timeStamp);
+// need to add drive letter
-TN_DEBUG2( "CThumbnailStore::StoreThumbnailL() timeStamp       iFs %Ld", timeStamp.Int64() );
+TFileName path;
+path.Append(iDriveChar);
+path.Append(KDrv);
+path.Append(aPath);
+timeErr = iFs.Modified(path, timeStamp);
+if (timeErr != KErrNone)
+{
+TN_DEBUG2( "CThumbnailStore::StoreThumbnailL() error getting timeStamp: %d", timeErr );
+}
+else
+{
+TN_DEBUG2( "CThumbnailStore::StoreThumbnailL() timeStamp       iFs %Ld", timeStamp.Int64() );
+}
 }
-else
+if (!aPath.Length() || timeErr != KErrNone)
 {
 // otherwise current time
 timeStamp.UniversalTime();
 TN_DEBUG2( "CThumbnailStore::StoreThumbnailL() timeStamp   current %Ld", timeStamp.Int64() );
 }
 TInt CThumbnailStore::MaintenanceTimerCallBack(TAny* aAny)
 {
 CThumbnailStore* self = static_cast<CThumbnailStore*>( aAny );
 self->iMaintenanceTimer->Cancel();
+TInt MPXHarvesting(0);
+TInt DaemonProcessing(0);
+TInt ret = RProperty::Get(KTAGDPSNotification, KMPXHarvesting, MPXHarvesting);
+if(ret != KErrNone || MPXHarvesting)
+{
+TN_DEBUG3( "CThumbnailStore::MaintenanceTimerCallBack() KMPXHarvesting err == %d, MPXHarvesting == %d", ret, MPXHarvesting);
+self->iIdle = EFalse;
+}
+TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() KMPXHarvesting == %d", MPXHarvesting);
+ret = RProperty::Get(KTAGDPSNotification, KDaemonProcessing, DaemonProcessing);
+if(ret != KErrNone || DaemonProcessing)
+{
+TN_DEBUG3( "CThumbnailStore::MaintenanceTimerCallBack() KDaemonProcessing err == %d, DaemonProcessing == %d", ret, DaemonProcessing);
+self->iIdle = EFalse;
+}
+TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() DaemonProcessing == %d", DaemonProcessing);
 if (self->iIdle)
 {
 TN_DEBUG2( "CThumbnailStore::MaintenanceTimerCallBack() - maintenance, store %d", self->iDrive);
 TFileName full;
 TInt count = 0;
 TBool finished = EFalse;
-TChar dChar = 0;
-User::LeaveIfError( iFs.DriveToChar( iDrive, dChar ));
 RThumbnailTransaction transaction( iDatabase );
 CleanupClosePushL( transaction );
 transaction.BeginL();
 RSqlStatement stmt;
 rowid = stmt.ColumnInt64( column++ );
 stmt.ColumnText( column, path );
 full.Zero();
-full.Append(dChar);
+full.Append(iDriveChar);
 full.Append(KDrv);
 full.Append(path);
 // if path matches previous one, skip
 if (path.CompareF(prevPath) != 0)
 }
 else
 {
 TInt MPXHarvesting(0);
 TInt DaemonProcessing(0);
 TInt ret = RProperty::Get(KTAGDPSNotification, KMPXHarvesting, MPXHarvesting);
-if(!ret)
+if(ret != KErrNone || MPXHarvesting)
+{
+TN_DEBUG3( "CThumbnailStore::ActivityChanged() KMPXHarvesting err == %d, MPXHarvesting == %d", ret, MPXHarvesting);
+iIdle = EFalse;
 return;
+}
-TN_DEBUG2( "CThumbnailStore::ActivityChanged() KMPXHarvesting == %d", KMPXHarvesting);
 ret = RProperty::Get(KTAGDPSNotification, KDaemonProcessing, DaemonProcessing);
+if(ret != KErrNone || DaemonProcessing)
-if(!ret)
+{
+TN_DEBUG3( "CThumbnailStore::ActivityChanged() KDaemonProcessing err == %d DaemonProcessing == %d", ret, DaemonProcessing );
+iIdle = EFalse;
 return;
-TN_DEBUG2( "CThumbnailStore::ActivityChanged() DaemonProcessing == %d", DaemonProcessing);
-if(!MPXHarvesting && !DaemonProcessing)
-{
-TN_DEBUG1( "CThumbnailStore::ActivityChanged() - starting maintenance");
-iIdle = ETrue;
-StartMaintenance();
 }
+TN_DEBUG1( "CThumbnailStore::ActivityChanged() - starting maintenance");
+iIdle = ETrue;
+StartMaintenance();
 }
 }
 // CThumbnailStoreDiskSpaceNotifierAO class

branch	RCL_3
changeset 8	7403edfcf0fb
parent 7	2eb74cf6572e
child 9	dea39715fc05