author | eilers <eilers> | 2002-11-13 14:14:51 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-11-13 14:14:51 (UTC) |
commit | 2255284b2e80bdc2881ab9106e9afa614a08c140 (patch) (unidiff) | |
tree | 89e53028d842061371e6414ee037f96fa0fbef5e /libopie2/opiepim/backend | |
parent | eaecbed44924ece119c5b41db2828b4554f263d2 (diff) | |
download | opie-2255284b2e80bdc2881ab9106e9afa614a08c140.zip opie-2255284b2e80bdc2881ab9106e9afa614a08c140.tar.gz opie-2255284b2e80bdc2881ab9106e9afa614a08c140.tar.bz2 |
Added sorted for Contacts..
4 files changed, 50 insertions, 0 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.h b/libopie2/opiepim/backend/ocontactaccessbackend.h index c898f61..821f5bf 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend.h | |||
@@ -10,24 +10,27 @@ | |||
10 | *This program is free software; you can redistribute it and/or | 10 | *This program is free software; you can redistribute it and/or |
11 | *modify it under the terms of the GNU Library General Public | 11 | *modify it under the terms of the GNU Library General Public |
12 | * License as published by the Free Software Foundation; | 12 | * License as published by the Free Software Foundation; |
13 | * either version 2 of the License, or (at your option) any later | 13 | * either version 2 of the License, or (at your option) any later |
14 | * version. | 14 | * version. |
15 | * ===================================================================== | 15 | * ===================================================================== |
16 | * ToDo: Define enum for query settings | 16 | * ToDo: Define enum for query settings |
17 | * ===================================================================== | 17 | * ===================================================================== |
18 | * Version: $Id$ | 18 | * Version: $Id$ |
19 | * ===================================================================== | 19 | * ===================================================================== |
20 | * History: | 20 | * History: |
21 | * $Log$ | 21 | * $Log$ |
22 | * Revision 1.4 2002/11/13 14:14:51 eilers | ||
23 | * Added sorted for Contacts.. | ||
24 | * | ||
22 | * Revision 1.3 2002/11/01 15:10:42 eilers | 25 | * Revision 1.3 2002/11/01 15:10:42 eilers |
23 | * Added regExp-search in database for all fields in a contact. | 26 | * Added regExp-search in database for all fields in a contact. |
24 | * | 27 | * |
25 | * Revision 1.2 2002/10/07 17:34:24 eilers | 28 | * Revision 1.2 2002/10/07 17:34:24 eilers |
26 | * added OBackendFactory for advanced backend access | 29 | * added OBackendFactory for advanced backend access |
27 | * | 30 | * |
28 | * Revision 1.1 2002/09/27 17:11:44 eilers | 31 | * Revision 1.1 2002/09/27 17:11:44 eilers |
29 | * Added API for accessing the Contact-Database ! It is compiling, but | 32 | * Added API for accessing the Contact-Database ! It is compiling, but |
30 | * please do not expect that anything is working ! | 33 | * please do not expect that anything is working ! |
31 | * I will debug that stuff in the next time .. | 34 | * I will debug that stuff in the next time .. |
32 | * Please read README_COMPILE for compiling ! | 35 | * Please read README_COMPILE for compiling ! |
33 | * | 36 | * |
@@ -67,15 +70,16 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> { | |||
67 | 70 | ||
68 | /** Return all possible settings. | 71 | /** Return all possible settings. |
69 | * @return All settings provided by the current backend | 72 | * @return All settings provided by the current backend |
70 | * (i.e.: query_WildCards & query_IgnoreCase) | 73 | * (i.e.: query_WildCards & query_IgnoreCase) |
71 | */ | 74 | */ |
72 | virtual const uint querySettings() = 0; | 75 | virtual const uint querySettings() = 0; |
73 | 76 | ||
74 | /** Check whether settings are correct. | 77 | /** Check whether settings are correct. |
75 | * @return <i>true</i> if the given settings are correct and possible. | 78 | * @return <i>true</i> if the given settings are correct and possible. |
76 | */ | 79 | */ |
77 | virtual bool hasQuerySettings (uint querySettings) const = 0; | 80 | virtual bool hasQuerySettings (uint querySettings) const = 0; |
78 | 81 | ||
82 | virtual QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ) = 0; | ||
79 | 83 | ||
80 | }; | 84 | }; |
81 | #endif | 85 | #endif |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp index faa72b4..09ae37b 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp | |||
@@ -8,24 +8,27 @@ | |||
8 | *This program is free software; you can redistribute it and/or | 8 | *This program is free software; you can redistribute it and/or |
9 | *modify it under the terms of the GNU Library General Public | 9 | *modify it under the terms of the GNU Library General Public |
10 | * License as published by the Free Software Foundation; either | 10 | * License as published by the Free Software Foundation; either |
11 | * version 2 of the License, or (at your option) any later version. | 11 | * version 2 of the License, or (at your option) any later version. |
12 | * ===================================================================== | 12 | * ===================================================================== |
13 | * ToDo: | 13 | * ToDo: |
14 | * | 14 | * |
15 | * ===================================================================== | 15 | * ===================================================================== |
16 | * Version: $Id$ | 16 | * Version: $Id$ |
17 | * ===================================================================== | 17 | * ===================================================================== |
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.4 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.3 2002/11/11 16:41:09 kergoth | 23 | * Revision 1.3 2002/11/11 16:41:09 kergoth |
21 | * no default arguments in implementation | 24 | * no default arguments in implementation |
22 | * | 25 | * |
23 | * Revision 1.2 2002/11/10 15:41:53 eilers | 26 | * Revision 1.2 2002/11/10 15:41:53 eilers |
24 | * Bugfixes.. | 27 | * Bugfixes.. |
25 | * | 28 | * |
26 | * Revision 1.1 2002/11/09 14:34:52 eilers | 29 | * Revision 1.1 2002/11/09 14:34:52 eilers |
27 | * Added VCard Backend. | 30 | * Added VCard Backend. |
28 | * | 31 | * |
29 | */ | 32 | */ |
30 | #include "ocontactaccessbackend_vcard.h" | 33 | #include "ocontactaccessbackend_vcard.h" |
31 | #include "../../library/backend/vobject_p.h" | 34 | #include "../../library/backend/vobject_p.h" |
@@ -169,24 +172,31 @@ const uint OContactAccessBackend_VCard::querySettings() | |||
169 | } | 172 | } |
170 | 173 | ||
171 | bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const | 174 | bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const |
172 | { | 175 | { |
173 | return false; // No search possible, therefore all settings invalid ;) | 176 | return false; // No search possible, therefore all settings invalid ;) |
174 | } | 177 | } |
175 | 178 | ||
176 | bool OContactAccessBackend_VCard::wasChangedExternally() | 179 | bool OContactAccessBackend_VCard::wasChangedExternally() |
177 | { | 180 | { |
178 | return false; // Don't expect concurrent access | 181 | return false; // Don't expect concurrent access |
179 | } | 182 | } |
180 | 183 | ||
184 | // Not implemented | ||
185 | QArray<int> OContactAccessBackend_VCard::sorted( bool , int, int, int ) | ||
186 | { | ||
187 | QArray<int> ar(0); | ||
188 | return ar; | ||
189 | } | ||
190 | |||
181 | // *** Private stuff *** | 191 | // *** Private stuff *** |
182 | 192 | ||
183 | 193 | ||
184 | OContact OContactAccessBackend_VCard::parseVObject( VObject *obj ) | 194 | OContact OContactAccessBackend_VCard::parseVObject( VObject *obj ) |
185 | { | 195 | { |
186 | OContact c; | 196 | OContact c; |
187 | 197 | ||
188 | VObjectIterator it; | 198 | VObjectIterator it; |
189 | initPropIterator( &it, obj ); | 199 | initPropIterator( &it, obj ); |
190 | while( moreIteration( &it ) ) { | 200 | while( moreIteration( &it ) ) { |
191 | VObject *o = nextVObject( &it ); | 201 | VObject *o = nextVObject( &it ); |
192 | QCString name = vObjectName( o ); | 202 | QCString name = vObjectName( o ); |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h index 177ec24..4437756 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_vcard.h | |||
@@ -8,24 +8,27 @@ | |||
8 | *This program is free software; you can redistribute it and/or | 8 | *This program is free software; you can redistribute it and/or |
9 | *modify it under the terms of the GNU Library General Public | 9 | *modify it under the terms of the GNU Library General Public |
10 | * License as published by the Free Software Foundation; either | 10 | * License as published by the Free Software Foundation; either |
11 | * version 2 of the License, or (at your option) any later version. | 11 | * version 2 of the License, or (at your option) any later version. |
12 | * ===================================================================== | 12 | * ===================================================================== |
13 | * ToDo: | 13 | * ToDo: |
14 | * | 14 | * |
15 | * ===================================================================== | 15 | * ===================================================================== |
16 | * Version: $Id$ | 16 | * Version: $Id$ |
17 | * ===================================================================== | 17 | * ===================================================================== |
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.3 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.2 2002/11/10 15:41:53 eilers | 23 | * Revision 1.2 2002/11/10 15:41:53 eilers |
21 | * Bugfixes.. | 24 | * Bugfixes.. |
22 | * | 25 | * |
23 | * Revision 1.1 2002/11/09 14:34:52 eilers | 26 | * Revision 1.1 2002/11/09 14:34:52 eilers |
24 | * Added VCard Backend. | 27 | * Added VCard Backend. |
25 | * | 28 | * |
26 | */ | 29 | */ |
27 | #ifndef __OCONTACTACCESSBACKEND_VCARD_H_ | 30 | #ifndef __OCONTACTACCESSBACKEND_VCARD_H_ |
28 | #define __OCONTACTACCESSBACKEND_VCARD_H_ | 31 | #define __OCONTACTACCESSBACKEND_VCARD_H_ |
29 | 32 | ||
30 | #include <opie/ocontact.h> | 33 | #include <opie/ocontact.h> |
31 | 34 | ||
@@ -44,24 +47,25 @@ class OContactAccessBackend_VCard : public OContactAccessBackend { | |||
44 | 47 | ||
45 | bool add ( const OContact& newcontact ); | 48 | bool add ( const OContact& newcontact ); |
46 | bool remove ( int uid ); | 49 | bool remove ( int uid ); |
47 | bool replace ( const OContact& contact ); | 50 | bool replace ( const OContact& contact ); |
48 | 51 | ||
49 | OContact find ( int uid ) const; | 52 | OContact find ( int uid ) const; |
50 | QArray<int> allRecords() const; | 53 | QArray<int> allRecords() const; |
51 | QArray<int> queryByExample ( const OContact &query, int settings ); | 54 | QArray<int> queryByExample ( const OContact &query, int settings ); |
52 | QArray<int> matchRegexp( const QRegExp &r ) const; | 55 | QArray<int> matchRegexp( const QRegExp &r ) const; |
53 | 56 | ||
54 | const uint querySettings(); | 57 | const uint querySettings(); |
55 | bool hasQuerySettings (uint querySettings) const; | 58 | bool hasQuerySettings (uint querySettings) const; |
59 | QArray<int> sorted( bool ascending, int sortOrder, int sortFilter, int cat ); | ||
56 | bool wasChangedExternally(); | 60 | bool wasChangedExternally(); |
57 | 61 | ||
58 | private: | 62 | private: |
59 | OContact parseVObject( VObject* obj ); | 63 | OContact parseVObject( VObject* obj ); |
60 | VObject* createVObject( const OContact& c ); | 64 | VObject* createVObject( const OContact& c ); |
61 | QDate convVCardDateToDate( const QString& datestr ); | 65 | QDate convVCardDateToDate( const QString& datestr ); |
62 | VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value ); | 66 | VObject *safeAddPropValue( VObject *o, const char* prop, const QString& value ); |
63 | VObject *safeAddProp( VObject* o, const char* prop); | 67 | VObject *safeAddProp( VObject* o, const char* prop); |
64 | 68 | ||
65 | bool m_dirty : 1; | 69 | bool m_dirty : 1; |
66 | QString m_file; | 70 | QString m_file; |
67 | QMap<int, OContact> m_map; | 71 | QMap<int, OContact> m_map; |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h index f7e8207..8b95102 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h | |||
@@ -8,24 +8,27 @@ | |||
8 | *modify it under the terms of the GNU Library General Public | 8 | *modify it under the terms of the GNU Library General Public |
9 | * License as published by the Free Software Foundation; either | 9 | * License as published by the Free Software Foundation; either |
10 | * version 2 of the License, or (at your option) any later version. | 10 | * version 2 of the License, or (at your option) any later version. |
11 | * ===================================================================== | 11 | * ===================================================================== |
12 | * ToDo: XML-Backend: Automatic reload if something was changed... | 12 | * ToDo: XML-Backend: Automatic reload if something was changed... |
13 | * | 13 | * |
14 | * | 14 | * |
15 | * ===================================================================== | 15 | * ===================================================================== |
16 | * Version: $Id$ | 16 | * Version: $Id$ |
17 | * ===================================================================== | 17 | * ===================================================================== |
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.6 2002/11/13 14:14:51 eilers | ||
21 | * Added sorted for Contacts.. | ||
22 | * | ||
20 | * Revision 1.5 2002/11/01 15:10:42 eilers | 23 | * Revision 1.5 2002/11/01 15:10:42 eilers |
21 | * Added regExp-search in database for all fields in a contact. | 24 | * Added regExp-search in database for all fields in a contact. |
22 | * | 25 | * |
23 | * Revision 1.4 2002/10/16 10:52:40 eilers | 26 | * Revision 1.4 2002/10/16 10:52:40 eilers |
24 | * Added some docu to the interface and now using the cache infrastucture by zecke.. :) | 27 | * Added some docu to the interface and now using the cache infrastucture by zecke.. :) |
25 | * | 28 | * |
26 | * Revision 1.3 2002/10/14 16:21:54 eilers | 29 | * Revision 1.3 2002/10/14 16:21:54 eilers |
27 | * Some minor interface updates | 30 | * Some minor interface updates |
28 | * | 31 | * |
29 | * Revision 1.2 2002/10/07 17:34:24 eilers | 32 | * Revision 1.2 2002/10/07 17:34:24 eilers |
30 | * added OBackendFactory for advanced backend access | 33 | * added OBackendFactory for advanced backend access |
31 | * | 34 | * |
@@ -38,24 +41,25 @@ | |||
38 | * | 41 | * |
39 | */ | 42 | */ |
40 | 43 | ||
41 | #ifndef _OContactAccessBackend_XML_ | 44 | #ifndef _OContactAccessBackend_XML_ |
42 | #define _OContactAccessBackend_XML_ | 45 | #define _OContactAccessBackend_XML_ |
43 | 46 | ||
44 | #include <qasciidict.h> | 47 | #include <qasciidict.h> |
45 | #include <qdatetime.h> | 48 | #include <qdatetime.h> |
46 | #include <qfile.h> | 49 | #include <qfile.h> |
47 | #include <qfileinfo.h> | 50 | #include <qfileinfo.h> |
48 | #include <qregexp.h> | 51 | #include <qregexp.h> |
49 | #include <qarray.h> | 52 | #include <qarray.h> |
53 | #include <qmap.h> | ||
50 | 54 | ||
51 | #include <qpe/global.h> | 55 | #include <qpe/global.h> |
52 | 56 | ||
53 | #include <opie/xmltree.h> | 57 | #include <opie/xmltree.h> |
54 | #include "ocontactaccessbackend.h" | 58 | #include "ocontactaccessbackend.h" |
55 | #include "ocontactaccess.h" | 59 | #include "ocontactaccess.h" |
56 | 60 | ||
57 | #include <stdlib.h> | 61 | #include <stdlib.h> |
58 | #include <errno.h> | 62 | #include <errno.h> |
59 | 63 | ||
60 | using namespace Opie; | 64 | using namespace Opie; |
61 | 65 | ||
@@ -292,24 +296,52 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
292 | switch ( querySettings & ~OContactAccess::IgnoreCase ){ | 296 | switch ( querySettings & ~OContactAccess::IgnoreCase ){ |
293 | case OContactAccess::RegExp: | 297 | case OContactAccess::RegExp: |
294 | return ( true ); | 298 | return ( true ); |
295 | case OContactAccess::WildCards: | 299 | case OContactAccess::WildCards: |
296 | return ( true ); | 300 | return ( true ); |
297 | case OContactAccess::ExactMatch: | 301 | case OContactAccess::ExactMatch: |
298 | return ( true ); | 302 | return ( true ); |
299 | default: | 303 | default: |
300 | return ( false ); | 304 | return ( false ); |
301 | } | 305 | } |
302 | } | 306 | } |
303 | 307 | ||
308 | // Currently only asc implemented.. | ||
309 | QArray<int> sorted( bool asc, int , int , int ) | ||
310 | { | ||
311 | QMap<QString, int> nameToUid; | ||
312 | QStringList names; | ||
313 | QArray<int> m_currentQuery( m_contactList.count() ); | ||
314 | |||
315 | // First fill map and StringList with all Names ( better LastNames ? ) | ||
316 | // Afterwards sort namelist and use map to fill array to return.. | ||
317 | QValueListConstIterator<OContact> it; | ||
318 | for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){ | ||
319 | names.append( (*it).lastName() ); | ||
320 | nameToUid.insert( (*it).lastName(), (*it).uid() ); | ||
321 | } | ||
322 | names.sort(); | ||
323 | |||
324 | int i = 0; | ||
325 | if ( asc ){ | ||
326 | for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it ) | ||
327 | m_currentQuery[i++] = nameToUid[ (*it) ]; | ||
328 | }else{ | ||
329 | for ( QStringList::Iterator it = names.end(); it != names.begin(); --it ) | ||
330 | m_currentQuery[i++] = nameToUid[ (*it) ]; | ||
331 | } | ||
332 | |||
333 | return m_currentQuery; | ||
334 | |||
335 | } | ||
304 | bool add ( const OContact &newcontact ) | 336 | bool add ( const OContact &newcontact ) |
305 | { | 337 | { |
306 | //qWarning("odefaultbackend: ACTION::ADD"); | 338 | //qWarning("odefaultbackend: ACTION::ADD"); |
307 | updateJournal (newcontact, OContact::ACTION_ADD); | 339 | updateJournal (newcontact, OContact::ACTION_ADD); |
308 | addContact_p( newcontact ); | 340 | addContact_p( newcontact ); |
309 | 341 | ||
310 | m_changed = true; | 342 | m_changed = true; |
311 | 343 | ||
312 | return true; | 344 | return true; |
313 | } | 345 | } |
314 | 346 | ||
315 | bool replace ( const OContact &contact ) | 347 | bool replace ( const OContact &contact ) |