photosgallery/collectionframework/datasource/plugins/glxdatasourcemde2.5/src/glxdatasourcetaskmds.cpp
equal
deleted
inserted
replaced
251 |
251 |
252 CMdELogicCondition& rootCondition = aQuery.Conditions(); |
252 CMdELogicCondition& rootCondition = aQuery.Conditions(); |
253 CMdEObjectDef* objectDef = &aObjectDef; |
253 CMdEObjectDef* objectDef = &aObjectDef; |
254 |
254 |
255 SetQueryFilterConditionsL(rootCondition, *objectDef, aFilterProperties); |
255 SetQueryFilterConditionsL(rootCondition, *objectDef, aFilterProperties); |
256 SetSortOrderL(aQuery, aObjectDef, aFilterProperties); |
256 |
|
257 if (aQuery.ResultMode() != EQueryResultModeCount) |
|
258 { |
|
259 SetSortOrderL(aQuery, aObjectDef, aFilterProperties); |
|
260 } |
257 |
261 |
258 if( KGlxCollectionRootId != aContainerId.Value() ) |
262 if( KGlxCollectionRootId != aContainerId.Value() ) |
259 { |
263 { |
260 CMdELogicCondition* containerCondition = NULL; |
264 CMdELogicCondition* containerCondition = NULL; |
261 CMdERelationCondition* relationCondition = NULL; |
265 CMdERelationCondition* relationCondition = NULL; |
542 |
546 |
543 CMdEQuery* query = DataSource()->Session().NewObjectQueryL(*DataSource()->NamespaceDef(), |
547 CMdEQuery* query = DataSource()->Session().NewObjectQueryL(*DataSource()->NamespaceDef(), |
544 *queryBaseObject, this); |
548 *queryBaseObject, this); |
545 CleanupStack::PushL(query); |
549 CleanupStack::PushL(query); |
546 |
550 |
|
551 query->SetResultMode(aResultMode); |
547 SetQueryConditionsL(*query, iFilterProperties, aContainerId, aObjectDef); |
552 SetQueryConditionsL(*query, iFilterProperties, aContainerId, aObjectDef); |
548 query->SetResultMode(aResultMode); |
|
549 |
553 |
550 CleanupStack::Pop(query); |
554 CleanupStack::Pop(query); |
551 |
555 |
552 AppendQueryL(query, aQueryType); |
556 AppendQueryL(query, aQueryType); |
553 |
557 |