author | tille <tille> | 2003-05-08 13:55:09 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-08 13:55:09 (UTC) |
commit | 0cb4111d34d9fe96731f48983e1ff2e67262db02 (patch) (unidiff) | |
tree | ce6ec869ae7753ab0261e7ad075a10ad8b0a404b /libopie2/opiepim/core | |
parent | 78c60031b506b85dc20bd555d83486aeb831bf38 (diff) | |
download | opie-0cb4111d34d9fe96731f48983e1ff2e67262db02.zip opie-0cb4111d34d9fe96731f48983e1ff2e67262db02.tar.gz opie-0cb4111d34d9fe96731f48983e1ff2e67262db02.tar.bz2 |
search stuff
and match, toRichText & toShortText in oevent
-rw-r--r-- | libopie2/opiepim/core/ocontactaccess.cpp | 13 | ||||
-rw-r--r-- | libopie2/opiepim/core/ocontactaccess.h | 6 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimaccesstemplate.h | 12 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.h | 6 |
4 files changed, 28 insertions, 9 deletions
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp index 9c9338e..2e3ec1f 100644 --- a/libopie2/opiepim/core/ocontactaccess.cpp +++ b/libopie2/opiepim/core/ocontactaccess.cpp | |||
@@ -12,24 +12,28 @@ | |||
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.8 2003/05/08 13:55:09 tille | ||
25 | * search stuff | ||
26 | * and match, toRichText & toShortText in oevent | ||
27 | * | ||
24 | * Revision 1.7 2002/11/13 14:14:51 eilers | 28 | * Revision 1.7 2002/11/13 14:14:51 eilers |
25 | * Added sorted for Contacts.. | 29 | * Added sorted for Contacts.. |
26 | * | 30 | * |
27 | * Revision 1.6 2002/11/01 15:10:42 eilers | 31 | * Revision 1.6 2002/11/01 15:10:42 eilers |
28 | * Added regExp-search in database for all fields in a contact. | 32 | * Added regExp-search in database for all fields in a contact. |
29 | * | 33 | * |
30 | * Revision 1.5 2002/10/16 10:52:40 eilers | 34 | * Revision 1.5 2002/10/16 10:52:40 eilers |
31 | * Added some docu to the interface and now using the cache infrastucture by zecke.. :) | 35 | * Added some docu to the interface and now using the cache infrastucture by zecke.. :) |
32 | * | 36 | * |
33 | * Revision 1.4 2002/10/14 16:21:54 eilers | 37 | * Revision 1.4 2002/10/14 16:21:54 eilers |
34 | * Some minor interface updates | 38 | * Some minor interface updates |
35 | * | 39 | * |
@@ -64,35 +68,35 @@ | |||
64 | #include <errno.h> | 68 | #include <errno.h> |
65 | #include <fcntl.h> | 69 | #include <fcntl.h> |
66 | #include <unistd.h> | 70 | #include <unistd.h> |
67 | #include <stdlib.h> | 71 | #include <stdlib.h> |
68 | 72 | ||
69 | #include "ocontactaccessbackend_xml.h" | 73 | #include "ocontactaccessbackend_xml.h" |
70 | 74 | ||
71 | 75 | ||
72 | OContactAccess::OContactAccess ( const QString appname, const QString , | 76 | OContactAccess::OContactAccess ( const QString appname, const QString , |
73 | OContactAccessBackend* end, bool autosync ): | 77 | OContactAccessBackend* end, bool autosync ): |
74 | OPimAccessTemplate<OContact>( end ) | 78 | OPimAccessTemplate<OContact>( end ) |
75 | { | 79 | { |
76 | /* take care of the backend. If there is no one defined, we | 80 | /* take care of the backend. If there is no one defined, we |
77 | * will use the XML-Backend as default (until we have a cute SQL-Backend..). | 81 | * will use the XML-Backend as default (until we have a cute SQL-Backend..). |
78 | */ | 82 | */ |
79 | if( end == 0 ) { | 83 | if( end == 0 ) { |
80 | qWarning ("Using BackendFactory !"); | 84 | qWarning ("Using BackendFactory !"); |
81 | end = OBackendFactory<OContactAccessBackend>::Default( "contact", appname ); | 85 | end = OBackendFactory<OContactAccessBackend>::Default( "contact", appname ); |
82 | } | 86 | } |
83 | // Set backend locally and in template | 87 | // Set backend locally and in template |
84 | m_backEnd = end; | 88 | m_backEnd = end; |
85 | OPimAccessTemplate<OContact>::setBackEnd (end); | 89 | OPimAccessTemplate<OContact>::setBackEnd (end); |
86 | 90 | ||
87 | 91 | ||
88 | /* Connect signal of external db change to function */ | 92 | /* Connect signal of external db change to function */ |
89 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); | 93 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); |
90 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), | 94 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), |
91 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); | 95 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); |
92 | if ( autosync ){ | 96 | if ( autosync ){ |
93 | QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this ); | 97 | QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this ); |
94 | connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)), | 98 | connect( syncchannel, SIGNAL(received(const QCString &, const QByteArray &)), |
95 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); | 99 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); |
96 | } | 100 | } |
97 | 101 | ||
98 | 102 | ||
@@ -117,29 +121,24 @@ bool OContactAccess::save () | |||
117 | reload(); | 121 | reload(); |
118 | 122 | ||
119 | bool status = OPimAccessTemplate<OContact>::save(); | 123 | bool status = OPimAccessTemplate<OContact>::save(); |
120 | if ( !status ) return false; | 124 | if ( !status ) return false; |
121 | 125 | ||
122 | /* Now tell everyone that new data is available. | 126 | /* Now tell everyone that new data is available. |
123 | */ | 127 | */ |
124 | QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" ); | 128 | QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" ); |
125 | 129 | ||
126 | return true; | 130 | return true; |
127 | } | 131 | } |
128 | 132 | ||
129 | ORecordList<OContact> OContactAccess::matchRegexp( const QRegExp &r ) const{ | ||
130 | QArray<int> matchingContacts = m_backEnd -> matchRegexp( r ); | ||
131 | return ( ORecordList<OContact>(matchingContacts, this) ); | ||
132 | } | ||
133 | |||
134 | const uint OContactAccess::querySettings() | 133 | const uint OContactAccess::querySettings() |
135 | { | 134 | { |
136 | return ( m_backEnd->querySettings() ); | 135 | return ( m_backEnd->querySettings() ); |
137 | } | 136 | } |
138 | 137 | ||
139 | bool OContactAccess::hasQuerySettings ( int querySettings ) const | 138 | bool OContactAccess::hasQuerySettings ( int querySettings ) const |
140 | { | 139 | { |
141 | return ( m_backEnd->hasQuerySettings ( querySettings ) ); | 140 | return ( m_backEnd->hasQuerySettings ( querySettings ) ); |
142 | } | 141 | } |
143 | ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const | 142 | ORecordList<OContact> OContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const |
144 | { | 143 | { |
145 | QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat ); | 144 | QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat ); |
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h index d7ceaf2..e90db32 100644 --- a/libopie2/opiepim/core/ocontactaccess.h +++ b/libopie2/opiepim/core/ocontactaccess.h | |||
@@ -8,24 +8,28 @@ | |||
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.8 2003/05/08 13:55:09 tille | ||
21 | * search stuff | ||
22 | * and match, toRichText & toShortText in oevent | ||
23 | * | ||
20 | * Revision 1.7 2003/04/13 18:07:10 zecke | 24 | * Revision 1.7 2003/04/13 18:07:10 zecke |
21 | * More API doc | 25 | * More API doc |
22 | * QString -> const QString& | 26 | * QString -> const QString& |
23 | * QString = 0l -> QString::null | 27 | * QString = 0l -> QString::null |
24 | * | 28 | * |
25 | * Revision 1.6 2003/01/02 14:27:12 eilers | 29 | * Revision 1.6 2003/01/02 14:27:12 eilers |
26 | * Improved query by example: Search by date is possible.. First step | 30 | * Improved query by example: Search by date is possible.. First step |
27 | * for a today plugin for birthdays.. | 31 | * for a today plugin for birthdays.. |
28 | * | 32 | * |
29 | * Revision 1.5 2002/11/13 14:14:51 eilers | 33 | * Revision 1.5 2002/11/13 14:14:51 eilers |
30 | * Added sorted for Contacts.. | 34 | * Added sorted for Contacts.. |
31 | * | 35 | * |
@@ -101,26 +105,24 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact> | |||
101 | WildCards = 0x0001, | 105 | WildCards = 0x0001, |
102 | IgnoreCase = 0x0002, | 106 | IgnoreCase = 0x0002, |
103 | RegExp = 0x0004, | 107 | RegExp = 0x0004, |
104 | ExactMatch = 0x0008, | 108 | ExactMatch = 0x0008, |
105 | MatchOne = 0x0010, // Only one Entry must match | 109 | MatchOne = 0x0010, // Only one Entry must match |
106 | DateDiff = 0x0020, // Find all entries from today until given date | 110 | DateDiff = 0x0020, // Find all entries from today until given date |
107 | DateYear = 0x0040, // The year matches | 111 | DateYear = 0x0040, // The year matches |
108 | DateMonth = 0x0080, // The month matches | 112 | DateMonth = 0x0080, // The month matches |
109 | DateDay = 0x0100, // The day matches | 113 | DateDay = 0x0100, // The day matches |
110 | }; | 114 | }; |
111 | 115 | ||
112 | 116 | ||
113 | ORecordList<OContact> matchRegexp( const QRegExp &r )const; | ||
114 | |||
115 | /** Return all Contacts in a sorted manner. | 117 | /** Return all Contacts in a sorted manner. |
116 | * @param ascending true: Sorted in acending order. | 118 | * @param ascending true: Sorted in acending order. |
117 | * @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess | 119 | * @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess |
118 | * @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess | 120 | * @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess |
119 | * @param cat Currently not implemented. Just defined to stay compatible to otodoaccess | 121 | * @param cat Currently not implemented. Just defined to stay compatible to otodoaccess |
120 | */ | 122 | */ |
121 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const; | 123 | List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const; |
122 | 124 | ||
123 | /** Return all possible settings. | 125 | /** Return all possible settings. |
124 | * @return All settings provided by the current backend | 126 | * @return All settings provided by the current backend |
125 | * (i.e.: query_WildCards & query_IgnoreCase) | 127 | * (i.e.: query_WildCards & query_IgnoreCase) |
126 | */ | 128 | */ |
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h index 6a3a0db..8ff205c 100644 --- a/libopie2/opiepim/core/opimaccesstemplate.h +++ b/libopie2/opiepim/core/opimaccesstemplate.h | |||
@@ -60,24 +60,30 @@ public: | |||
60 | /** | 60 | /** |
61 | * if the resource was changed externally | 61 | * if the resource was changed externally |
62 | * You should use the signal handling instead of polling possible changes ! | 62 | * You should use the signal handling instead of polling possible changes ! |
63 | * zecke: Do you implement a signal for otodoaccess ? | 63 | * zecke: Do you implement a signal for otodoaccess ? |
64 | */ | 64 | */ |
65 | bool wasChangedExternally()const; | 65 | bool wasChangedExternally()const; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * return a List of records | 68 | * return a List of records |
69 | * you can iterate over them | 69 | * you can iterate over them |
70 | */ | 70 | */ |
71 | virtual List allRecords()const; | 71 | virtual List allRecords()const; |
72 | |||
73 | /** | ||
74 | * return a List of records | ||
75 | * that match the regex | ||
76 | */ | ||
77 | virtual List matchRegexp( const QRegExp &r ) const; | ||
72 | 78 | ||
73 | /** | 79 | /** |
74 | * queryByExample. | 80 | * queryByExample. |
75 | * @see otodoaccess, ocontactaccess | 81 | * @see otodoaccess, ocontactaccess |
76 | */ | 82 | */ |
77 | virtual List queryByExample( const T& t, int querySettings, const QDateTime& d = QDateTime() ); | 83 | virtual List queryByExample( const T& t, int querySettings, const QDateTime& d = QDateTime() ); |
78 | 84 | ||
79 | /** | 85 | /** |
80 | * find the OPimRecord uid | 86 | * find the OPimRecord uid |
81 | */ | 87 | */ |
82 | virtual T find( int uid )const; | 88 | virtual T find( int uid )const; |
83 | 89 | ||
@@ -172,24 +178,30 @@ bool OPimAccessTemplate<T>::reload() { | |||
172 | } | 178 | } |
173 | template <class T> | 179 | template <class T> |
174 | bool OPimAccessTemplate<T>::save() { | 180 | bool OPimAccessTemplate<T>::save() { |
175 | return m_backEnd->save(); | 181 | return m_backEnd->save(); |
176 | } | 182 | } |
177 | template <class T> | 183 | template <class T> |
178 | typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { | 184 | typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { |
179 | QArray<int> ints = m_backEnd->allRecords(); | 185 | QArray<int> ints = m_backEnd->allRecords(); |
180 | List lis(ints, this ); | 186 | List lis(ints, this ); |
181 | return lis; | 187 | return lis; |
182 | } | 188 | } |
183 | template <class T> | 189 | template <class T> |
190 | typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::matchRegexp( const QRegExp &r )const { | ||
191 | QArray<int> ints = m_backEnd->matchRegexp( r ); | ||
192 | List lis(ints, this ); | ||
193 | return lis; | ||
194 | } | ||
195 | template <class T> | ||
184 | QArray<int> OPimAccessTemplate<T>::records()const { | 196 | QArray<int> OPimAccessTemplate<T>::records()const { |
185 | return m_backEnd->allRecords(); | 197 | return m_backEnd->allRecords(); |
186 | } | 198 | } |
187 | template <class T> | 199 | template <class T> |
188 | typename OPimAccessTemplate<T>::List | 200 | typename OPimAccessTemplate<T>::List |
189 | OPimAccessTemplate<T>::queryByExample( const T& t, int settings, const QDateTime& d ) { | 201 | OPimAccessTemplate<T>::queryByExample( const T& t, int settings, const QDateTime& d ) { |
190 | QArray<int> ints = m_backEnd->queryByExample( t, settings, d ); | 202 | QArray<int> ints = m_backEnd->queryByExample( t, settings, d ); |
191 | 203 | ||
192 | List lis(ints, this ); | 204 | List lis(ints, this ); |
193 | return lis; | 205 | return lis; |
194 | } | 206 | } |
195 | template <class T> | 207 | template <class T> |
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h index c7f9460..de2d9f4 100644 --- a/libopie2/opiepim/core/opimrecord.h +++ b/libopie2/opiepim/core/opimrecord.h | |||
@@ -64,24 +64,30 @@ public: | |||
64 | 64 | ||
65 | /** | 65 | /** |
66 | * a small one line summary | 66 | * a small one line summary |
67 | */ | 67 | */ |
68 | virtual QString toShortText()const = 0; | 68 | virtual QString toShortText()const = 0; |
69 | 69 | ||
70 | /** | 70 | /** |
71 | * the name of the Record | 71 | * the name of the Record |
72 | */ | 72 | */ |
73 | virtual QString type()const = 0; | 73 | virtual QString type()const = 0; |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * matches the Records the regular expression? | ||
77 | */ | ||
78 | virtual bool match( const QString ®exp ) const {return match(QRegExp(regexp));}; | ||
79 | virtual bool match( const QRegExp ®exp ) const = 0; | ||
80 | |||
81 | /** | ||
76 | * converts the internal structure to a map | 82 | * converts the internal structure to a map |
77 | */ | 83 | */ |
78 | virtual QMap<int, QString> toMap()const = 0; | 84 | virtual QMap<int, QString> toMap()const = 0; |
79 | 85 | ||
80 | /** | 86 | /** |
81 | * key value representation of extra items | 87 | * key value representation of extra items |
82 | */ | 88 | */ |
83 | virtual QMap<QString, QString> toExtraMap()const = 0; | 89 | virtual QMap<QString, QString> toExtraMap()const = 0; |
84 | 90 | ||
85 | /** | 91 | /** |
86 | * the name for a recordField | 92 | * the name for a recordField |
87 | */ | 93 | */ |