summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontactaccess.cpp8
-rw-r--r--libopie/pim/ocontactaccess.h11
-rw-r--r--libopie/pim/ocontactaccessbackend.h4
-rw-r--r--libopie/pim/ocontactaccessbackend_vcard.cpp10
-rw-r--r--libopie/pim/ocontactaccessbackend_vcard.h4
-rw-r--r--libopie/pim/ocontactaccessbackend_xml.h32
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend.h4
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.cpp10
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_vcard.h4
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.h32
-rw-r--r--libopie2/opiepim/core/ocontactaccess.cpp8
-rw-r--r--libopie2/opiepim/core/ocontactaccess.h11
12 files changed, 138 insertions, 0 deletions
diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp
index f868b53..9c9338e 100644
--- a/libopie/pim/ocontactaccess.cpp
+++ b/libopie/pim/ocontactaccess.cpp
@@ -8,32 +8,35 @@
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 * Info: This class could just work with a change in the header-file 12 * Info: This class could just work with a change in the header-file
13 * of the Contact class ! Therefore our libopie only compiles 13 * of the Contact class ! Therefore our libopie only compiles
14 * with our version of libqpe 14 * with our version of libqpe
15 * ===================================================================== 15 * =====================================================================
16 * ToDo: XML-Backend: Automatic reload if something was changed... 16 * ToDo: XML-Backend: Automatic reload if something was changed...
17 * 17 *
18 * 18 *
19 * ===================================================================== 19 * =====================================================================
20 * Version: $Id$ 20 * Version: $Id$
21 * ===================================================================== 21 * =====================================================================
22 * History: 22 * History:
23 * $Log$ 23 * $Log$
24 * Revision 1.7 2002/11/13 14:14:51 eilers
25 * Added sorted for Contacts..
26 *
24 * Revision 1.6 2002/11/01 15:10:42 eilers 27 * Revision 1.6 2002/11/01 15:10:42 eilers
25 * Added regExp-search in database for all fields in a contact. 28 * Added regExp-search in database for all fields in a contact.
26 * 29 *
27 * Revision 1.5 2002/10/16 10:52:40 eilers 30 * Revision 1.5 2002/10/16 10:52:40 eilers
28 * Added some docu to the interface and now using the cache infrastucture by zecke.. :) 31 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
29 * 32 *
30 * Revision 1.4 2002/10/14 16:21:54 eilers 33 * Revision 1.4 2002/10/14 16:21:54 eilers
31 * Some minor interface updates 34 * Some minor interface updates
32 * 35 *
33 * Revision 1.3 2002/10/07 17:34:24 eilers 36 * Revision 1.3 2002/10/07 17:34:24 eilers
34 * added OBackendFactory for advanced backend access 37 * added OBackendFactory for advanced backend access
35 * 38 *
36 * Revision 1.2 2002/10/02 16:18:11 eilers 39 * Revision 1.2 2002/10/02 16:18:11 eilers
37 * debugged and seems to work almost perfectly .. 40 * debugged and seems to work almost perfectly ..
38 * 41 *
39 * Revision 1.1 2002/09/27 17:11:44 eilers 42 * Revision 1.1 2002/09/27 17:11:44 eilers
@@ -124,32 +127,37 @@ bool OContactAccess::save ()
124} 127}
125 128
126ORecordList<OContact> OContactAccess::matchRegexp( const QRegExp &r ) const{ 129ORecordList<OContact> OContactAccess::matchRegexp( const QRegExp &r ) const{
127 QArray<int> matchingContacts = m_backEnd -> matchRegexp( r ); 130 QArray<int> matchingContacts = m_backEnd -> matchRegexp( r );
128 return ( ORecordList<OContact>(matchingContacts, this) ); 131 return ( ORecordList<OContact>(matchingContacts, this) );
129} 132}
130 133
131const uint OContactAccess::querySettings() 134const uint OContactAccess::querySettings()
132{ 135{
133 return ( m_backEnd->querySettings() ); 136 return ( m_backEnd->querySettings() );
134} 137}
135 138
136bool OContactAccess::hasQuerySettings ( int querySettings ) const 139bool OContactAccess::hasQuerySettings ( int querySettings ) const
137{ 140{
138 return ( m_backEnd->hasQuerySettings ( querySettings ) ); 141 return ( m_backEnd->hasQuerySettings ( querySettings ) );
139} 142}
143ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
144{
145 QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
146 return ( ORecordList<OContact>(matchingContacts, this) );
147}
140 148
141 149
142bool OContactAccess::wasChangedExternally()const 150bool OContactAccess::wasChangedExternally()const
143{ 151{
144 return ( m_backEnd->wasChangedExternally() ); 152 return ( m_backEnd->wasChangedExternally() );
145} 153}
146 154
147 155
148void OContactAccess::copMessage( const QCString &msg, const QByteArray & ) 156void OContactAccess::copMessage( const QCString &msg, const QByteArray & )
149{ 157{
150 if ( msg == "addressbookUpdated()" ){ 158 if ( msg == "addressbookUpdated()" ){
151 qWarning ("OContactAccess: Received addressbokUpdated()"); 159 qWarning ("OContactAccess: Received addressbokUpdated()");
152 emit signalChanged ( this ); 160 emit signalChanged ( this );
153 } else if ( msg == "flush()" ) { 161 } else if ( msg == "flush()" ) {
154 qWarning ("OContactAccess: Received flush()"); 162 qWarning ("OContactAccess: Received flush()");
155 save (); 163 save ();
diff --git a/libopie/pim/ocontactaccess.h b/libopie/pim/ocontactaccess.h
index b4921d5..961968f 100644
--- a/libopie/pim/ocontactaccess.h
+++ b/libopie/pim/ocontactaccess.h
@@ -4,32 +4,35 @@
4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
5 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org) 5 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org)
6 * 6 *
7 * ===================================================================== 7 * =====================================================================
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; 10 * License as published by the Free Software Foundation;
11 * either version 2 of the License, or (at your option) any later 11 * either version 2 of the License, or (at your option) any later
12 * version. 12 * version.
13 * ===================================================================== 13 * =====================================================================
14 * ToDo: Define enum for query settings 14 * ToDo: Define enum for query settings
15 * ===================================================================== 15 * =====================================================================
16 * Version: $Id$ 16 * Version: $Id$
17 * ===================================================================== 17 * =====================================================================
18 * History: 18 * History:
19 * $Log$ 19 * $Log$
20 * Revision 1.5 2002/11/13 14:14:51 eilers
21 * Added sorted for Contacts..
22 *
20 * Revision 1.4 2002/11/01 15:10:42 eilers 23 * Revision 1.4 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.3 2002/10/16 10:52:40 eilers 26 * Revision 1.3 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.2 2002/10/14 16:21:54 eilers 29 * Revision 1.2 2002/10/14 16:21:54 eilers
27 * Some minor interface updates 30 * Some minor interface updates
28 * 31 *
29 * Revision 1.1 2002/09/27 17:11:44 eilers 32 * Revision 1.1 2002/09/27 17:11:44 eilers
30 * Added API for accessing the Contact-Database ! It is compiling, but 33 * Added API for accessing the Contact-Database ! It is compiling, but
31 * please do not expect that anything is working ! 34 * please do not expect that anything is working !
32 * I will debug that stuff in the next time .. 35 * I will debug that stuff in the next time ..
33 * Please read README_COMPILE for compiling ! 36 * Please read README_COMPILE for compiling !
34 * 37 *
35 * ===================================================================== 38 * =====================================================================
@@ -78,32 +81,40 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
78 /** Constants for query. 81 /** Constants for query.
79 * Use this constants to set the query parameters. 82 * Use this constants to set the query parameters.
80 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes ! 83 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes !
81 * @see queryByExample() 84 * @see queryByExample()
82 */ 85 */
83 enum QuerySettings { 86 enum QuerySettings {
84 WildCards = 0x0001, 87 WildCards = 0x0001,
85 IgnoreCase = 0x0002, 88 IgnoreCase = 0x0002,
86 RegExp = 0x0004, 89 RegExp = 0x0004,
87 ExactMatch = 0x0008, 90 ExactMatch = 0x0008,
88 MatchOne = 0x0010 // Only one Entry must match 91 MatchOne = 0x0010 // Only one Entry must match
89 }; 92 };
90 93
91 94
92 ORecordList<OContact> matchRegexp( const QRegExp &r )const; 95 ORecordList<OContact> matchRegexp( const QRegExp &r )const;
93 96
97 /** Return all Contacts in a sorted manner.
98 * @param ascending true: Sorted in acending order.
99 * @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
100 * @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
101 * @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
102 */
103 List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;
104
94 /** Return all possible settings. 105 /** Return all possible settings.
95 * @return All settings provided by the current backend 106 * @return All settings provided by the current backend
96 * (i.e.: query_WildCards & query_IgnoreCase) 107 * (i.e.: query_WildCards & query_IgnoreCase)
97 */ 108 */
98 const uint querySettings(); 109 const uint querySettings();
99 110
100 /** Check whether settings are correct. 111 /** Check whether settings are correct.
101 * @return <i>true</i> if the given settings are correct and possible. 112 * @return <i>true</i> if the given settings are correct and possible.
102 */ 113 */
103 bool hasQuerySettings ( int querySettings ) const; 114 bool hasQuerySettings ( int querySettings ) const;
104 115
105 /** 116 /**
106 * if the resource was changed externally. 117 * if the resource was changed externally.
107 * You should use the signal instead of polling possible changes ! 118 * You should use the signal instead of polling possible changes !
108 */ 119 */
109 bool wasChangedExternally()const; 120 bool wasChangedExternally()const;
diff --git a/libopie/pim/ocontactaccessbackend.h b/libopie/pim/ocontactaccessbackend.h
index c898f61..821f5bf 100644
--- a/libopie/pim/ocontactaccessbackend.h
+++ b/libopie/pim/ocontactaccessbackend.h
@@ -6,32 +6,35 @@
6 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 6 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
7 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org) 7 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org)
8 * 8 *
9 * ===================================================================== 9 * =====================================================================
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 *
34 * ===================================================================== 37 * =====================================================================
35 * 38 *
36 */ 39 */
37 40
@@ -63,19 +66,20 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
63 */ 66 */
64 virtual bool wasChangedExternally() = 0; 67 virtual bool wasChangedExternally() = 0;
65 68
66 virtual QArray<int> matchRegexp( const QRegExp &r ) const = 0; 69 virtual QArray<int> matchRegexp( const QRegExp &r ) const = 0;
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/libopie/pim/ocontactaccessbackend_vcard.cpp b/libopie/pim/ocontactaccessbackend_vcard.cpp
index faa72b4..09ae37b 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.cpp
+++ b/libopie/pim/ocontactaccessbackend_vcard.cpp
@@ -4,32 +4,35 @@
4 * Copyright (C) 2000 Trolltech AS. All rights reserved. 4 * Copyright (C) 2000 Trolltech AS. All rights reserved.
5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
6 * 6 *
7 * ===================================================================== 7 * =====================================================================
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"
32#include "../../library/backend/qfiledirect_p.h" 35#include "../../library/backend/qfiledirect_p.h"
33 36
34#include <qpe/timeconversion.h> 37#include <qpe/timeconversion.h>
35 38
@@ -165,32 +168,39 @@ QArray<int> OContactAccessBackend_VCard::matchRegexp( const QRegExp& ) const
165 168
166const uint OContactAccessBackend_VCard::querySettings() 169const uint OContactAccessBackend_VCard::querySettings()
167{ 170{
168 return 0; // No search possible 171 return 0; // No search possible
169} 172}
170 173
171bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const 174bool 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
176bool OContactAccessBackend_VCard::wasChangedExternally() 179bool 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
185QArray<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
184OContact OContactAccessBackend_VCard::parseVObject( VObject *obj ) 194OContact 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 );
193 QCString value = vObjectStringZValue( o ); 203 QCString value = vObjectStringZValue( o );
194 if ( name == VCNameProp ) { 204 if ( name == VCNameProp ) {
195 VObjectIterator nit; 205 VObjectIterator nit;
196 initPropIterator( &nit, o ); 206 initPropIterator( &nit, o );
diff --git a/libopie/pim/ocontactaccessbackend_vcard.h b/libopie/pim/ocontactaccessbackend_vcard.h
index 177ec24..4437756 100644
--- a/libopie/pim/ocontactaccessbackend_vcard.h
+++ b/libopie/pim/ocontactaccessbackend_vcard.h
@@ -4,32 +4,35 @@
4 * Copyright (C) 2000 Trolltech AS. All rights reserved. 4 * Copyright (C) 2000 Trolltech AS. All rights reserved.
5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
6 * 6 *
7 * ===================================================================== 7 * =====================================================================
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
32#include "ocontactaccessbackend.h" 35#include "ocontactaccessbackend.h"
33 36
34class VObject; 37class VObject;
35 38
@@ -40,31 +43,32 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
40 bool load (); 43 bool load ();
41 bool reload(); 44 bool reload();
42 bool save(); 45 bool save();
43 void clear (); 46 void clear ();
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
58private: 62private:
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;
68}; 72};
69 73
70#endif 74#endif
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index f7e8207..8b95102 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -4,62 +4,66 @@
4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
5 * 5 *
6 * ===================================================================== 6 * =====================================================================
7 *This program is free software; you can redistribute it and/or 7 *This program is free software; you can redistribute it and/or
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 *
32 * Revision 1.1 2002/09/27 17:11:44 eilers 35 * Revision 1.1 2002/09/27 17:11:44 eilers
33 * Added API for accessing the Contact-Database ! It is compiling, but 36 * Added API for accessing the Contact-Database ! It is compiling, but
34 * please do not expect that anything is working ! 37 * please do not expect that anything is working !
35 * I will debug that stuff in the next time .. 38 * I will debug that stuff in the next time ..
36 * Please read README_COMPILE for compiling ! 39 * Please read README_COMPILE for compiling !
37 * 40 *
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
60using namespace Opie; 64using namespace Opie;
61 65
62/* the default xml implementation */ 66/* the default xml implementation */
63class OContactAccessBackend_XML : public OContactAccessBackend { 67class OContactAccessBackend_XML : public OContactAccessBackend {
64 public: 68 public:
65 OContactAccessBackend_XML ( QString appname, QString filename = 0l ): 69 OContactAccessBackend_XML ( QString appname, QString filename = 0l ):
@@ -288,32 +292,60 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
288 /* OContactAccess::IgnoreCase may be added with one 292 /* OContactAccess::IgnoreCase may be added with one
289 * of the other settings, but never used alone. 293 * of the other settings, but never used alone.
290 * The other settings are just valid alone... 294 * The other settings are just valid alone...
291 */ 295 */
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 )
316 { 348 {
317 m_changed = true; 349 m_changed = true;
318 350
319 bool found = false; 351 bool found = false;
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
@@ -6,32 +6,35 @@
6 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 6 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
7 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org) 7 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org)
8 * 8 *
9 * ===================================================================== 9 * =====================================================================
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 *
34 * ===================================================================== 37 * =====================================================================
35 * 38 *
36 */ 39 */
37 40
@@ -63,19 +66,20 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
63 */ 66 */
64 virtual bool wasChangedExternally() = 0; 67 virtual bool wasChangedExternally() = 0;
65 68
66 virtual QArray<int> matchRegexp( const QRegExp &r ) const = 0; 69 virtual QArray<int> matchRegexp( const QRegExp &r ) const = 0;
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
@@ -4,32 +4,35 @@
4 * Copyright (C) 2000 Trolltech AS. All rights reserved. 4 * Copyright (C) 2000 Trolltech AS. All rights reserved.
5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
6 * 6 *
7 * ===================================================================== 7 * =====================================================================
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"
32#include "../../library/backend/qfiledirect_p.h" 35#include "../../library/backend/qfiledirect_p.h"
33 36
34#include <qpe/timeconversion.h> 37#include <qpe/timeconversion.h>
35 38
@@ -165,32 +168,39 @@ QArray<int> OContactAccessBackend_VCard::matchRegexp( const QRegExp& ) const
165 168
166const uint OContactAccessBackend_VCard::querySettings() 169const uint OContactAccessBackend_VCard::querySettings()
167{ 170{
168 return 0; // No search possible 171 return 0; // No search possible
169} 172}
170 173
171bool OContactAccessBackend_VCard::hasQuerySettings (uint ) const 174bool 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
176bool OContactAccessBackend_VCard::wasChangedExternally() 179bool 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
185QArray<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
184OContact OContactAccessBackend_VCard::parseVObject( VObject *obj ) 194OContact 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 );
193 QCString value = vObjectStringZValue( o ); 203 QCString value = vObjectStringZValue( o );
194 if ( name == VCNameProp ) { 204 if ( name == VCNameProp ) {
195 VObjectIterator nit; 205 VObjectIterator nit;
196 initPropIterator( &nit, o ); 206 initPropIterator( &nit, 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
@@ -4,32 +4,35 @@
4 * Copyright (C) 2000 Trolltech AS. All rights reserved. 4 * Copyright (C) 2000 Trolltech AS. All rights reserved.
5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 5 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
6 * 6 *
7 * ===================================================================== 7 * =====================================================================
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
32#include "ocontactaccessbackend.h" 35#include "ocontactaccessbackend.h"
33 36
34class VObject; 37class VObject;
35 38
@@ -40,31 +43,32 @@ class OContactAccessBackend_VCard : public OContactAccessBackend {
40 bool load (); 43 bool load ();
41 bool reload(); 44 bool reload();
42 bool save(); 45 bool save();
43 void clear (); 46 void clear ();
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
58private: 62private:
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;
68}; 72};
69 73
70#endif 74#endif
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
@@ -4,62 +4,66 @@
4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
5 * 5 *
6 * ===================================================================== 6 * =====================================================================
7 *This program is free software; you can redistribute it and/or 7 *This program is free software; you can redistribute it and/or
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 *
32 * Revision 1.1 2002/09/27 17:11:44 eilers 35 * Revision 1.1 2002/09/27 17:11:44 eilers
33 * Added API for accessing the Contact-Database ! It is compiling, but 36 * Added API for accessing the Contact-Database ! It is compiling, but
34 * please do not expect that anything is working ! 37 * please do not expect that anything is working !
35 * I will debug that stuff in the next time .. 38 * I will debug that stuff in the next time ..
36 * Please read README_COMPILE for compiling ! 39 * Please read README_COMPILE for compiling !
37 * 40 *
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
60using namespace Opie; 64using namespace Opie;
61 65
62/* the default xml implementation */ 66/* the default xml implementation */
63class OContactAccessBackend_XML : public OContactAccessBackend { 67class OContactAccessBackend_XML : public OContactAccessBackend {
64 public: 68 public:
65 OContactAccessBackend_XML ( QString appname, QString filename = 0l ): 69 OContactAccessBackend_XML ( QString appname, QString filename = 0l ):
@@ -288,32 +292,60 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
288 /* OContactAccess::IgnoreCase may be added with one 292 /* OContactAccess::IgnoreCase may be added with one
289 * of the other settings, but never used alone. 293 * of the other settings, but never used alone.
290 * The other settings are just valid alone... 294 * The other settings are just valid alone...
291 */ 295 */
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 )
316 { 348 {
317 m_changed = true; 349 m_changed = true;
318 350
319 bool found = false; 351 bool found = false;
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index f868b53..9c9338e 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -8,32 +8,35 @@
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 * Info: This class could just work with a change in the header-file 12 * Info: This class could just work with a change in the header-file
13 * of the Contact class ! Therefore our libopie only compiles 13 * of the Contact class ! Therefore our libopie only compiles
14 * with our version of libqpe 14 * with our version of libqpe
15 * ===================================================================== 15 * =====================================================================
16 * ToDo: XML-Backend: Automatic reload if something was changed... 16 * ToDo: XML-Backend: Automatic reload if something was changed...
17 * 17 *
18 * 18 *
19 * ===================================================================== 19 * =====================================================================
20 * Version: $Id$ 20 * Version: $Id$
21 * ===================================================================== 21 * =====================================================================
22 * History: 22 * History:
23 * $Log$ 23 * $Log$
24 * Revision 1.7 2002/11/13 14:14:51 eilers
25 * Added sorted for Contacts..
26 *
24 * Revision 1.6 2002/11/01 15:10:42 eilers 27 * Revision 1.6 2002/11/01 15:10:42 eilers
25 * Added regExp-search in database for all fields in a contact. 28 * Added regExp-search in database for all fields in a contact.
26 * 29 *
27 * Revision 1.5 2002/10/16 10:52:40 eilers 30 * Revision 1.5 2002/10/16 10:52:40 eilers
28 * Added some docu to the interface and now using the cache infrastucture by zecke.. :) 31 * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
29 * 32 *
30 * Revision 1.4 2002/10/14 16:21:54 eilers 33 * Revision 1.4 2002/10/14 16:21:54 eilers
31 * Some minor interface updates 34 * Some minor interface updates
32 * 35 *
33 * Revision 1.3 2002/10/07 17:34:24 eilers 36 * Revision 1.3 2002/10/07 17:34:24 eilers
34 * added OBackendFactory for advanced backend access 37 * added OBackendFactory for advanced backend access
35 * 38 *
36 * Revision 1.2 2002/10/02 16:18:11 eilers 39 * Revision 1.2 2002/10/02 16:18:11 eilers
37 * debugged and seems to work almost perfectly .. 40 * debugged and seems to work almost perfectly ..
38 * 41 *
39 * Revision 1.1 2002/09/27 17:11:44 eilers 42 * Revision 1.1 2002/09/27 17:11:44 eilers
@@ -124,32 +127,37 @@ bool OContactAccess::save ()
124} 127}
125 128
126ORecordList<OContact> OContactAccess::matchRegexp( const QRegExp &r ) const{ 129ORecordList<OContact> OContactAccess::matchRegexp( const QRegExp &r ) const{
127 QArray<int> matchingContacts = m_backEnd -> matchRegexp( r ); 130 QArray<int> matchingContacts = m_backEnd -> matchRegexp( r );
128 return ( ORecordList<OContact>(matchingContacts, this) ); 131 return ( ORecordList<OContact>(matchingContacts, this) );
129} 132}
130 133
131const uint OContactAccess::querySettings() 134const uint OContactAccess::querySettings()
132{ 135{
133 return ( m_backEnd->querySettings() ); 136 return ( m_backEnd->querySettings() );
134} 137}
135 138
136bool OContactAccess::hasQuerySettings ( int querySettings ) const 139bool OContactAccess::hasQuerySettings ( int querySettings ) const
137{ 140{
138 return ( m_backEnd->hasQuerySettings ( querySettings ) ); 141 return ( m_backEnd->hasQuerySettings ( querySettings ) );
139} 142}
143ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
144{
145 QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
146 return ( ORecordList<OContact>(matchingContacts, this) );
147}
140 148
141 149
142bool OContactAccess::wasChangedExternally()const 150bool OContactAccess::wasChangedExternally()const
143{ 151{
144 return ( m_backEnd->wasChangedExternally() ); 152 return ( m_backEnd->wasChangedExternally() );
145} 153}
146 154
147 155
148void OContactAccess::copMessage( const QCString &msg, const QByteArray & ) 156void OContactAccess::copMessage( const QCString &msg, const QByteArray & )
149{ 157{
150 if ( msg == "addressbookUpdated()" ){ 158 if ( msg == "addressbookUpdated()" ){
151 qWarning ("OContactAccess: Received addressbokUpdated()"); 159 qWarning ("OContactAccess: Received addressbokUpdated()");
152 emit signalChanged ( this ); 160 emit signalChanged ( this );
153 } else if ( msg == "flush()" ) { 161 } else if ( msg == "flush()" ) {
154 qWarning ("OContactAccess: Received flush()"); 162 qWarning ("OContactAccess: Received flush()");
155 save (); 163 save ();
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index b4921d5..961968f 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -4,32 +4,35 @@
4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de) 4 * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
5 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org) 5 * Copyright (c) 2002 by Holger Freyther (zecke@handhelds.org)
6 * 6 *
7 * ===================================================================== 7 * =====================================================================
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; 10 * License as published by the Free Software Foundation;
11 * either version 2 of the License, or (at your option) any later 11 * either version 2 of the License, or (at your option) any later
12 * version. 12 * version.
13 * ===================================================================== 13 * =====================================================================
14 * ToDo: Define enum for query settings 14 * ToDo: Define enum for query settings
15 * ===================================================================== 15 * =====================================================================
16 * Version: $Id$ 16 * Version: $Id$
17 * ===================================================================== 17 * =====================================================================
18 * History: 18 * History:
19 * $Log$ 19 * $Log$
20 * Revision 1.5 2002/11/13 14:14:51 eilers
21 * Added sorted for Contacts..
22 *
20 * Revision 1.4 2002/11/01 15:10:42 eilers 23 * Revision 1.4 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.3 2002/10/16 10:52:40 eilers 26 * Revision 1.3 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.2 2002/10/14 16:21:54 eilers 29 * Revision 1.2 2002/10/14 16:21:54 eilers
27 * Some minor interface updates 30 * Some minor interface updates
28 * 31 *
29 * Revision 1.1 2002/09/27 17:11:44 eilers 32 * Revision 1.1 2002/09/27 17:11:44 eilers
30 * Added API for accessing the Contact-Database ! It is compiling, but 33 * Added API for accessing the Contact-Database ! It is compiling, but
31 * please do not expect that anything is working ! 34 * please do not expect that anything is working !
32 * I will debug that stuff in the next time .. 35 * I will debug that stuff in the next time ..
33 * Please read README_COMPILE for compiling ! 36 * Please read README_COMPILE for compiling !
34 * 37 *
35 * ===================================================================== 38 * =====================================================================
@@ -78,32 +81,40 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
78 /** Constants for query. 81 /** Constants for query.
79 * Use this constants to set the query parameters. 82 * Use this constants to set the query parameters.
80 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes ! 83 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes !
81 * @see queryByExample() 84 * @see queryByExample()
82 */ 85 */
83 enum QuerySettings { 86 enum QuerySettings {
84 WildCards = 0x0001, 87 WildCards = 0x0001,
85 IgnoreCase = 0x0002, 88 IgnoreCase = 0x0002,
86 RegExp = 0x0004, 89 RegExp = 0x0004,
87 ExactMatch = 0x0008, 90 ExactMatch = 0x0008,
88 MatchOne = 0x0010 // Only one Entry must match 91 MatchOne = 0x0010 // Only one Entry must match
89 }; 92 };
90 93
91 94
92 ORecordList<OContact> matchRegexp( const QRegExp &r )const; 95 ORecordList<OContact> matchRegexp( const QRegExp &r )const;
93 96
97 /** Return all Contacts in a sorted manner.
98 * @param ascending true: Sorted in acending order.
99 * @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
100 * @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
101 * @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
102 */
103 List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;
104
94 /** Return all possible settings. 105 /** Return all possible settings.
95 * @return All settings provided by the current backend 106 * @return All settings provided by the current backend
96 * (i.e.: query_WildCards & query_IgnoreCase) 107 * (i.e.: query_WildCards & query_IgnoreCase)
97 */ 108 */
98 const uint querySettings(); 109 const uint querySettings();
99 110
100 /** Check whether settings are correct. 111 /** Check whether settings are correct.
101 * @return <i>true</i> if the given settings are correct and possible. 112 * @return <i>true</i> if the given settings are correct and possible.
102 */ 113 */
103 bool hasQuerySettings ( int querySettings ) const; 114 bool hasQuerySettings ( int querySettings ) const;
104 115
105 /** 116 /**
106 * if the resource was changed externally. 117 * if the resource was changed externally.
107 * You should use the signal instead of polling possible changes ! 118 * You should use the signal instead of polling possible changes !
108 */ 119 */
109 bool wasChangedExternally()const; 120 bool wasChangedExternally()const;