equal
deleted
inserted
replaced
113 WRITELOG1( "Harvester queue items = %d", iItemQueue.Count() ); |
113 WRITELOG1( "Harvester queue items = %d", iItemQueue.Count() ); |
114 #endif |
114 #endif |
115 item = iItemQueue[0]; |
115 item = iItemQueue[0]; |
116 iItemQueue.Remove( 0 ); |
116 iItemQueue.Remove( 0 ); |
117 } |
117 } |
118 else |
118 |
|
119 if( iItemQueue.Count() == 0 ) |
119 { |
120 { |
120 WRITELOG( "Harvester queue items zero!" ); |
121 WRITELOG( "Harvester queue items zero!" ); |
121 iItemQueue.Compress(); |
122 iItemQueue.Compress(); |
122 } |
123 } |
123 |
124 |
132 // --------------------------------------------------------------------------- |
133 // --------------------------------------------------------------------------- |
133 // |
134 // |
134 void CHarvesterQueue::Append( CHarvesterData* aItem ) |
135 void CHarvesterQueue::Append( CHarvesterData* aItem ) |
135 { |
136 { |
136 WRITELOG( "CHarvesterQueue::Append()" ); |
137 WRITELOG( "CHarvesterQueue::Append()" ); |
137 TInt err = KErrNone; |
138 TInt err( KErrNone ); |
138 |
139 |
139 if ( iBlacklist ) |
140 if ( iBlacklist ) |
140 { |
141 { |
141 TUint32 mediaId( 0 ); |
142 TUint32 mediaId( 0 ); |
142 err = iMediaIdUtil->GetMediaId( aItem->Uri(), mediaId ); |
143 err = iMediaIdUtil->GetMediaId( aItem->Uri(), mediaId ); |
150 aItem = NULL; |
151 aItem = NULL; |
151 return; |
152 return; |
152 } |
153 } |
153 } |
154 } |
154 |
155 |
155 if ( err == KErrNone ) |
156 // check if fast harvest file and add to start of queue |
156 { |
157 if ( aItem->ObjectType() == EFastHarvest || aItem->Origin() == MdeConstants::Object::ECamera ) |
157 // check if fast harvest file and add to start of queue |
158 { |
158 if ( aItem->ObjectType() == EFastHarvest || aItem->Origin() == MdeConstants::Object::ECamera ) |
159 err = iItemQueue.Insert( aItem, 0 ); |
159 { |
160 } |
160 err = iItemQueue.Insert( aItem, 0 ); |
161 else |
161 } |
162 { |
162 else |
163 err = iItemQueue.Append( aItem ); |
163 { |
164 } |
164 err = iItemQueue.Append( aItem ); |
|
165 } |
|
166 |
165 |
167 if( err != KErrNone ) |
166 if( err != KErrNone ) |
168 { |
167 { |
169 delete aItem; |
168 delete aItem; |
170 aItem = NULL; |
169 aItem = NULL; |
171 return; |
|
172 } |
|
173 } |
170 } |
174 } |
171 } |
175 |
172 |
176 // --------------------------------------------------------------------------- |
173 // --------------------------------------------------------------------------- |
177 // RemoveItems |
174 // RemoveItems |