FCL/sf/mw/mmappfw: comparison mmappcomponents/mmmtpdataprovider/src/cmmmtpdpmetadatavideoaccess.cpp

equal deleted inserted replaced

-:91d5ad76f5c6
+:16db3449d7ba
 #include "mmmtpdputility.h"
 #include "tmmmtpdppanic.h"
 #include "mmmtpvideodbdefs.h"
 #include "tobjectdescription.h"
-_LIT( KMTPNoBackupFolder, "nobackup\\" );
+const TInt KStorageRootMaxLength = 10;
 #ifdef _DEBUG
 static const TInt KMtpMaxStringDescLength = KMtpMaxStringLength - 1;
 #endif
 iQueryText = HBufC::NewL( KMaxQueryLength );
 User::LeaveIfError( iDbsSession.Connect() );
 TInt err = DriveInfo::GetDefaultDrive( DriveInfo::EDefaultPhoneMemory, iStoreNum );
-PRINT1( _L( "MM MTP <> CMmMtpDpMetadataVideoAccess::ConstructL, EDefaultPhoneMemory err = %d" ), err );
-User::LeaveIfError( err );
 err = OpenDatabase();
 if ( KErrNone != err )
 {
 //
 TInt CMmMtpDpMetadataVideoAccess::OpenDatabase()
 {
 PRINT( _L( "MM MTP => CMmMtpDpMetadataVideoAccess::OpenDatabase" ) );
-TFileName dbFileName;
+iRfs.CreatePrivatePath( iStoreNum );
-TDriveUnit dbDrive( iStoreNum );
+TInt err = iRfs.SetSessionToPrivate( iStoreNum );
-iRfs.PrivatePath( dbFileName );
-dbFileName.Insert( 0, dbDrive.Name() );
+if ( err == KErrNone )
-dbFileName.Append( KMTPNoBackupFolder );
+{
-dbFileName.Append( KMtpVideoDb );
+TRAP( err, iFileStore = CPermanentFileStore::OpenL( iRfs, KMtpVideoDb, EFileRead | EFileWrite ) );
-TInt err = iRfs.MkDirAll( dbFileName );
-if ( err == KErrNone || err == KErrAlreadyExists )
-{
-TRAP( err, iFileStore = CPermanentFileStore::OpenL( iRfs, dbFileName, EFileRead | EFileWrite ) );
 if ( err == KErrNone )
 TRAP( err, iFileStore->SetTypeL( iFileStore->Layout() ) );
 if ( err == KErrNone )
 PRINT1( _L( "MM MTP <> OpenDatabase RDbNamedDatabase::OpenL, err = %d" ), err );
 }
 if ( err != KErrNone )
 {
-iRfs.Delete( dbFileName );   // delete first before creating a new one
+iRfs.Delete( KMtpVideoDb );   // delete first before creating a new one
-TRAP( err, iFileStore = CPermanentFileStore::CreateL( iRfs, dbFileName, EFileRead | EFileWrite ) );
+TRAP( err, iFileStore = CPermanentFileStore::CreateL( iRfs, KMtpVideoDb, EFileRead | EFileWrite ) );
 PRINT1( _L( "MM MTP <> OpenDatabase RDbNamedDatabase::CreateL, err = %d" ), err );
 if ( err == KErrNone )
 {
 TRAP( err, iFileStore->SetTypeL( iFileStore->Layout() ) );
 TRAP( err, CreateDatabaseTablesL() );
 if ( KErrNone != err )
 {
 iDatabase.Close();
-iRfs.Delete( dbFileName );
+iRfs.Delete( KMtpVideoDb );
 }
 }
 }
 }
+TBuf<KStorageRootMaxLength> storeRoot;
+err = PathInfo::GetRootPath( storeRoot, iStoreNum );
+iRfs.SetSessionPath( storeRoot );
 if ( err == KErrNone )
 {
 iDbOpened = ETrue;
 }
-PRINT1( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::OpenDatabase err = %d" ), err );
+PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::OpenDatabase" ) );
 return err;
 }
 // ---------------------------------------------------------------------------
 // CMmMtpDpMetadataVideoAccess::OpenDatabaseL
 ExecuteQueryL( KAllColumns, KMtpVideoTable, KMtpVideoDeleted, KTrue, EFalse, EFalse );
 PRINT1( _L( "MM MTP <> CleanupDbIfNecessaryL Database deleted count = %d" ), iRecordSet.CountL() );
 for ( iRecordSet.FirstL(); iRecordSet.AtRow(); iRecordSet.NextL() )
 {
-#ifdef _DEBUG
 HBufC* data = ReadLongTextL( KMtpVideoLocation );
+CleanupStack::PushL( data );
 PRINT1( _L( "MM MTP <> CleanupDbIfNecessaryL removing %S from database" ), data );
-delete data;
-data = NULL;
-#endif
 iRecordSet.DeleteL();
+CleanupStack::PopAndDestroy( data );
 }
 delete iColSet;
 iColSet = NULL;
 iRecordSet.Close();
 //open database if not opened
 if ( !IsDatabaseOpened() )
 OpenDatabaseL();
 // File Path
-const TDesC& suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid );
+HBufC* suid = aObjectMetaData.DesC( CMTPObjectMetaData::ESuid ).AllocLC();  // + suid
-SetRecordL( suid, ERecordRead );
+SetRecordL( *suid, ERecordRead );
+CleanupStack::PopAndDestroy( suid ); // - suid
 HBufC* data = NULL;
 TDbColNo num;
 TUint32 uInt32 = 0;
 TUint16 uInt16 = 0;
 case EMTPObjectPropCodeDescription:
 {
 PRINT( _L( "MM MTP <> EMTPObjectPropCodeDescription-MD" ) );
 data = ReadLongTextL( KMtpVideoComment );
-CleanupStack::PushL( data ); // + data
 TInt len = data->Length();
 PRINT1( _L( "MM MTP <> CMmMtpDpMetadataMpxAccess::GetObjectMetadataValue len = %d" ),len );
-for ( TInt i = 0; i < len; i++ )
+if ( len != 0 )
-( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] );
+{
+for ( TInt i = 0; i < len; i++ )
-CleanupStack::PopAndDestroy( data ); // - data
+( ( CMTPTypeArray& ) aNewData ).AppendUintL( ( *data )[i] );
+}
+delete data;
 data = NULL;
 }
 break;
 case EMTPObjectPropCodeWidth:
 }
 // Pack the info to aNewData
 if ( data )
 {
-CleanupStack::PushL( data ); // + data
 #ifdef _DEBUG
 if ( data->Length() > KMtpMaxStringDescLength )   // Have to concatenate for MTP
 {
 PRINT1( _L( "MM MTP <> Descriptor will be concatenated from length %d to KMtpMaxStringLength" ), data->Length() );
 }
 }
 else
 {
 User::Leave( KErrArgument );
 }
-CleanupStack::PopAndDestroy( data ); // - data
+delete data;
+data = NULL;
 }
 PRINT( _L( "MM MTP <= CMmMtpDpMetadataVideoAccess::GetObjectMetadataValue" ) );
 }

branch	RCL_3
changeset 67	16db3449d7ba
parent 63	91d5ad76f5c6