summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/ChangeLog2
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend.cpp35
2 files changed, 25 insertions, 12 deletions
diff --git a/libopie2/opiepim/ChangeLog b/libopie2/opiepim/ChangeLog
index e94fa59..52b3f6b 100644
--- a/libopie2/opiepim/ChangeLog
+++ b/libopie2/opiepim/ChangeLog
@@ -1,16 +1,18 @@
+2005-03-18 Stefan Eilers <stefan@eilers-online.net>
+ * Rewrote generic sorted filter and added filter for "DoNotShowWithCategory", needed by addressbook (other filters need to be added!)
2005-01-16 Stefan Eilers <stefan@eilers-online.net>
* Added new OPimEventSortVector class, improved OPimSortVector
* OPimAccessBackend now supports generic sorting.
2005-01-03 Stefan Eilers <stefan@eilers-online.net>
* Fixing bug in API documentation
* Moving hasQuerySettings() and querySettings() to OPimAccessTemplate to be available for all frontends
2004-12-28 Stefan Eilers <stefan@eilers-online.net>
* Make improved query by example accessable via frontend
* Some API documentation improvement
* Cleanup of backend api..
* Fixing bug #1501
2004-11-23 Stefan Eilers <stefan@eilers-online.net>
* Implement fast and full featured version of sorted() for addressbook
* Implement generic queryByExample for all Addressboook backends. It allows incremental search.
* Update of API Documentation
2004-11-18 Holger Freyther <freyther@handhelds.org>
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.cpp b/libopie2/opiepim/backend/ocontactaccessbackend.cpp
index c09427c..6ac9934 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend.cpp
@@ -233,61 +233,72 @@ bool OPimContactAccessBackend::hasQuerySettings (uint querySettings) const
return ( true );
default:
return ( false );
}
}
UIDArray OPimContactAccessBackend::sorted( const UIDArray& ar, bool asc, int sortOrder,
int filter, const QArray<int>& categories )const {
odebug << "Using Unaccelerated OPimContactAccessBackend sorted Implementation" << oendl;
Internal::OPimContactSortVector vector(ar.count(), asc, sortOrder );
int item = 0;
uint cat_count = categories.count();
uint eve_count = ar.count();
- bool bCat = filter & OPimContactAccess::FilterCategory ? true : false;
- bool catPassed = false;
+ bool contactPassed = false;
int cat;
for ( uint i = 0; i < eve_count; ++i ) {
OPimContact contact = find( ar[i], ar, i, Frontend::Forward );
if ( contact.isEmpty() )
continue;
+ contactPassed = true;
+
+ // Filter all Contacts which have any category
+ if ( (filter & OPimContactAccess::DoNotShowWithCategory) ? true : false ){
+ if ( !contact.categories().isEmpty() )
+ continue;
+ }
+
/* show category */
/* -1 == unfiled */
- catPassed = false;
for ( uint cat_nu = 0; cat_nu < cat_count; ++cat_nu ) {
cat = categories[cat_nu];
- if ( bCat && cat == -1 ) {
- if(!contact.categories().isEmpty() )
- continue;
- } else if ( bCat && cat != 0)
- if (!contact.categories().contains( cat ) )
- continue;
- catPassed = true;
- break;
+
+ if ( (filter & OPimContactAccess::FilterCategory) ? true : false ){
+ if ( cat == -1 ) {
+ // We should search unfiled contacts.
+ // Unfiled categories have no category set, thus continue if
+ // this contact has no empty category.
+ if( !contact.categories().isEmpty() )
+ contactPassed = false;
+ } else if ( cat != 0 )
+ if ( !contact.categories().contains( cat ) )
+ contactPassed = false;
+ }
+
}
/*
* If none of the Categories matched
* continue
*/
- if ( !catPassed )
+ if ( !contactPassed )
continue;
vector.insert(item++, contact );
}
vector.resize( item );
/* sort it now */
vector.sort();
/* now get the uids */
UIDArray array( vector.count() );
for (uint i= 0; i < vector.count(); i++ )
array[i] = vector.uidAt( i );
return array;
}