equal
deleted
inserted
replaced
80 { |
80 { |
81 Cancel(); // Cancel any request, if outstanding |
81 Cancel(); // Cancel any request, if outstanding |
82 // Delete instance variables if any |
82 // Delete instance variables if any |
83 |
83 |
84 delete iMmcFileList; |
84 delete iMmcFileList; |
|
85 iMmcFileList = NULL; |
85 |
86 |
86 iEntryArray.ResetAndDestroy(); |
87 iEntryArray.ResetAndDestroy(); |
87 iEntryArray.Close(); |
88 iEntryArray.Close(); |
88 |
89 |
89 iHarvestEntryArray.ResetAndDestroy(); |
90 iHarvestEntryArray.ResetAndDestroy(); |
105 { |
106 { |
106 switch( iState ) |
107 switch( iState ) |
107 { |
108 { |
108 case( EUninitialized ): |
109 case( EUninitialized ): |
109 { |
110 { |
|
111 WRITELOG("CMmcScannerAO::RunL - Starting processing"); |
|
112 if( iMediaId == 0 ) |
|
113 { |
|
114 WRITELOG("CMmcScannerAO::RunL - MediaId == 0 -> end"); |
|
115 SetState( EDone ); |
|
116 break; |
|
117 } |
|
118 |
110 WRITELOG("CMmcScannerAO::RunL - Setting files to not present"); |
119 WRITELOG("CMmcScannerAO::RunL - Setting files to not present"); |
111 iMdEClient->SetFilesToNotPresent( iMediaId, ETrue ); |
120 iMdEClient->SetFilesToNotPresent( iMediaId, ETrue ); |
112 SetState( EReadFiles ); |
121 SetState( EReadFiles ); |
113 break; |
122 break; |
114 } |
123 } |
246 ei->PresentState() == EMdsModified ) |
255 ei->PresentState() == EMdsModified ) |
247 { |
256 { |
248 hd->SetEventType( EHarvesterEdit ); |
257 hd->SetEventType( EHarvesterEdit ); |
249 hd->SetObjectType( ENormal ); |
258 hd->SetObjectType( ENormal ); |
250 delete ei; |
259 delete ei; |
|
260 ei = NULL; |
251 } |
261 } |
252 else |
262 else |
253 { |
263 { |
254 hd->SetEventType( EHarvesterAdd ); |
264 hd->SetEventType( EHarvesterAdd ); |
255 hd->SetObjectType( EPlaceholder ); |
265 hd->SetObjectType( EPlaceholder ); |
256 hd->SetClientData( ei ); |
266 hd->SetClientData( ei ); |
257 } |
267 } |
258 iHdArray.Append( hd ); |
268 |
|
269 if(iHdArray.Append( hd ) != KErrNone ) |
|
270 { |
|
271 delete hd; |
|
272 hd = NULL; |
|
273 } |
259 iHarvestEntryArray.Remove( i ); |
274 iHarvestEntryArray.Remove( i ); |
260 } |
275 } |
261 |
276 |
262 if( iHarvestEntryArray.Count() == 0 ) |
277 if( iHarvestEntryArray.Count() == 0 ) |
263 { |
278 { |