28 |
28 |
29 // --------------------------------------------------------------------------- |
29 // --------------------------------------------------------------------------- |
30 // C++ Constructor |
30 // C++ Constructor |
31 // --------------------------------------------------------------------------- |
31 // --------------------------------------------------------------------------- |
32 // |
32 // |
33 CMPXHarvesterDB::CMPXHarvesterDB( TDriveNumber aDrive, RFs& aFs ) : |
33 CMPXHarvesterDB::CMPXHarvesterDB( TDriveNumber aDrive, RFs& aFs, TBool aEMMC ) : |
34 iDrive( aDrive), |
34 iDrive( aDrive), |
35 iFs( aFs ) |
35 iFs( aFs ), |
|
36 iEMMC( aEMMC ) |
36 #ifdef __RAMDISK_PERF_ENABLE |
37 #ifdef __RAMDISK_PERF_ENABLE |
37 ,iRamDrive(aDrive), |
38 ,iRamDrive(aDrive), |
38 iUseRamDrive(EFalse) |
39 iUseRamDrive(EFalse) |
39 #endif // __RAMDISK_PERF_ENABLE |
40 #endif // __RAMDISK_PERF_ENABLE |
40 { |
41 { |
52 |
53 |
53 // --------------------------------------------------------------------------- |
54 // --------------------------------------------------------------------------- |
54 // Two-Phased Constructor |
55 // Two-Phased Constructor |
55 // --------------------------------------------------------------------------- |
56 // --------------------------------------------------------------------------- |
56 // |
57 // |
57 CMPXHarvesterDB* CMPXHarvesterDB::NewL( TDriveNumber aDrive, RFs& aFs ) |
58 CMPXHarvesterDB* CMPXHarvesterDB::NewL( TDriveNumber aDrive, RFs& aFs, TBool aEMMC ) |
58 { |
59 { |
59 CMPXHarvesterDB* self = new( ELeave ) CMPXHarvesterDB( aDrive, aFs ); |
60 CMPXHarvesterDB* self = new( ELeave ) CMPXHarvesterDB( aDrive, aFs, aEMMC ); |
60 CleanupStack::PushL( self ); |
61 CleanupStack::PushL( self ); |
61 self->ConstructL(); |
62 self->ConstructL(); |
62 CleanupStack::Pop( self ); |
63 CleanupStack::Pop( self ); |
63 return self; |
64 return self; |
64 } |
65 } |
706 TDriveUnit ramDrive( iRamDrive ); |
707 TDriveUnit ramDrive( iRamDrive ); |
707 fileName.Append( ramDrive.Name() ); |
708 fileName.Append( ramDrive.Name() ); |
708 fileName.Append( KHarvesterDBPath ); |
709 fileName.Append( KHarvesterDBPath ); |
709 TDriveUnit drive( iDrive ); |
710 TDriveUnit drive( iDrive ); |
710 fileName.Append(drive.Name()[0]); |
711 fileName.Append(drive.Name()[0]); |
711 fileName.Append(KHarvesterDBName); |
712 |
|
713 //Use different name for Dbs if the system has an internal drive vs. MMC-only. |
|
714 //Since hard-coded drive letters in the Thumbnail URIs |
|
715 //So Dbs are not interchangeable between an internal drive system and MMC-only system. |
|
716 if ( iEMMC ) |
|
717 fileName.Append( KHarvesterDBNameEMMC ); |
|
718 else |
|
719 fileName.Append( KHarvesterDBName ); |
712 } |
720 } |
713 else |
721 else |
714 { |
722 { |
715 #endif // __RAMDISK_PERF_ENABLE |
723 #endif // __RAMDISK_PERF_ENABLE |
716 TDriveUnit drive( iDrive ); |
724 TDriveUnit drive( iDrive ); |
717 fileName.Append( drive.Name() ); |
725 fileName.Append( drive.Name() ); |
718 fileName.Append( KHarvesterDBPath ); |
726 fileName.Append( KHarvesterDBPath ); |
719 fileName.Append( KHarvesterDBName ); |
727 if ( iEMMC ) |
|
728 fileName.Append( KHarvesterDBNameEMMC ); |
|
729 else |
|
730 fileName.Append( KHarvesterDBName ); |
720 #ifdef __RAMDISK_PERF_ENABLE |
731 #ifdef __RAMDISK_PERF_ENABLE |
721 } |
732 } |
722 #endif // __RAMDISK_PERF_ENABLE |
733 #endif // __RAMDISK_PERF_ENABLE |
723 MPX_DEBUG2("CMPXHarvesterDB::GenerateDbName file name = %S", &fileName ); |
734 MPX_DEBUG2("CMPXHarvesterDB::GenerateDbName file name = %S", &fileName ); |
724 return fileName; |
735 return fileName; |