equal
deleted
inserted
replaced
146 aItem->Uri(), mediaId, time ) ) |
146 aItem->Uri(), mediaId, time ) ) |
147 { |
147 { |
148 WRITELOG( "CHarvesterQueue::Append() - found a blacklisted file" ); |
148 WRITELOG( "CHarvesterQueue::Append() - found a blacklisted file" ); |
149 delete aItem; |
149 delete aItem; |
150 aItem = NULL; |
150 aItem = NULL; |
151 err = KErrCorrupt; |
151 return; |
152 } |
152 } |
153 } |
153 } |
154 |
154 |
155 if ( err != KErrCorrupt ) |
155 if ( err == KErrNone ) |
156 { |
156 { |
157 // check if fast harvest file and add to start of queue |
157 // check if fast harvest file and add to start of queue |
158 if ( aItem->ObjectType() == EFastHarvest || aItem->Origin() == MdeConstants::Object::ECamera ) |
158 if ( aItem->ObjectType() == EFastHarvest || aItem->Origin() == MdeConstants::Object::ECamera ) |
159 { |
159 { |
160 err = iItemQueue.Insert( aItem, 0 ); |
160 err = iItemQueue.Insert( aItem, 0 ); |
166 |
166 |
167 if( err != KErrNone ) |
167 if( err != KErrNone ) |
168 { |
168 { |
169 delete aItem; |
169 delete aItem; |
170 aItem = NULL; |
170 aItem = NULL; |
|
171 return; |
171 } |
172 } |
172 } |
|
173 |
|
174 if ( err != KErrNone ) |
|
175 { |
|
176 WRITELOG1( "CHarvesterQueue::Append() - error: %d", err ); |
|
177 delete aItem; |
|
178 } |
173 } |
179 } |
174 } |
180 |
175 |
181 // --------------------------------------------------------------------------- |
176 // --------------------------------------------------------------------------- |
182 // RemoveItems |
177 // RemoveItems |
251 { |
246 { |
252 for( TInt i = aHarvesterDataArray.Count(); --i >= 0; ) |
247 for( TInt i = aHarvesterDataArray.Count(); --i >= 0; ) |
253 { |
248 { |
254 MonitorEvent( aHarvesterDataArray[i] ); |
249 MonitorEvent( aHarvesterDataArray[i] ); |
255 } |
250 } |
256 |
251 } |
257 // "clear" array after ownership of items |
252 |
258 // was changed for MonitorEvent-method |
|
259 aHarvesterDataArray.Reset(); |
|
260 } |
|
261 |
|