-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.h | 137 |
1 files changed, 104 insertions, 33 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h index c765ff5..c6e6cbc 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h | |||
@@ -17,6 +17,10 @@ | |||
17 | * ===================================================================== | 17 | * ===================================================================== |
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.10 2003/01/02 14:27:12 eilers | ||
21 | * Improved query by example: Search by date is possible.. First step | ||
22 | * for a today plugin for birthdays.. | ||
23 | * | ||
20 | * Revision 1.9 2002/12/08 12:48:57 eilers | 24 | * Revision 1.9 2002/12/08 12:48:57 eilers |
21 | * Moved journal-enum from ocontact into i the xml-backend.. | 25 | * Moved journal-enum from ocontact into i the xml-backend.. |
22 | * | 26 | * |
@@ -60,6 +64,7 @@ | |||
60 | #include <qregexp.h> | 64 | #include <qregexp.h> |
61 | #include <qarray.h> | 65 | #include <qarray.h> |
62 | #include <qmap.h> | 66 | #include <qmap.h> |
67 | #include <qdatetime.h> | ||
63 | 68 | ||
64 | #include <qpe/global.h> | 69 | #include <qpe/global.h> |
65 | 70 | ||
@@ -225,38 +230,89 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
225 | /* Search all fields and compare them with query object. Store them into list | 230 | /* Search all fields and compare them with query object. Store them into list |
226 | * if all fields matches. | 231 | * if all fields matches. |
227 | */ | 232 | */ |
233 | QDate* queryDate = 0l; | ||
234 | QDate* checkDate = 0l; | ||
228 | bool allcorrect = true; | 235 | bool allcorrect = true; |
229 | for ( int i = 0; i < Qtopia::rid; i++ ) { | 236 | for ( int i = 0; i < Qtopia::Groups; i++ ) { |
230 | /* Just compare fields which are not empty in the query object */ | 237 | // Birthday and anniversary are special nonstring fields and should |
231 | if ( !query.field(i).isEmpty() ){ | 238 | // be handled especially |
232 | switch ( settings & ~OContactAccess::IgnoreCase ){ | 239 | switch ( i ){ |
233 | case OContactAccess::RegExp:{ | 240 | case Qtopia::Birthday: |
234 | QRegExp expr ( query.field(i), | 241 | queryDate = new QDate( query.birthday() ); |
235 | !(settings & OContactAccess::IgnoreCase), | 242 | checkDate = new QDate( (*it).birthday() ); |
236 | false ); | 243 | case Qtopia::Anniversary: |
237 | if ( expr.find ( (*it).field(i), 0 ) == -1 ) | 244 | if ( queryDate == 0l ){ |
238 | allcorrect = false; | 245 | queryDate = new QDate( query.anniversary() ); |
239 | } | 246 | checkDate = new QDate( (*it).anniversary() ); |
240 | break; | ||
241 | case OContactAccess::WildCards:{ | ||
242 | QRegExp expr ( query.field(i), | ||
243 | !(settings & OContactAccess::IgnoreCase), | ||
244 | true ); | ||
245 | if ( expr.find ( (*it).field(i), 0 ) == -1 ) | ||
246 | allcorrect = false; | ||
247 | } | 247 | } |
248 | break; | 248 | |
249 | case OContactAccess::ExactMatch:{ | 249 | if ( queryDate->isValid() ){ |
250 | if (settings & OContactAccess::IgnoreCase){ | 250 | if ( settings & OContactAccess::DateYear ){ |
251 | if ( query.field(i).upper() != | 251 | if ( queryDate->year() != checkDate->year() ) |
252 | (*it).field(i).upper() ) | ||
253 | allcorrect = false; | 252 | allcorrect = false; |
254 | }else{ | 253 | } |
255 | if ( query.field(i) != (*it).field(i) ) | 254 | if ( settings & OContactAccess::DateMonth ){ |
255 | if ( queryDate->month() != checkDate->month() ) | ||
256 | allcorrect = false; | 256 | allcorrect = false; |
257 | } | ||
258 | if ( settings & OContactAccess::DateDay ){ | ||
259 | if ( queryDate->day() != checkDate->day() ) | ||
260 | allcorrect = false; | ||
261 | } | ||
262 | if ( settings & OContactAccess::DateDiff ) { | ||
263 | QDate current = QDate::currentDate(); | ||
264 | if ( current.daysTo( *queryDate ) > 0 ){ | ||
265 | if ( !( ( *checkDate >= current ) && | ||
266 | ( *checkDate <= *queryDate ) ) ) | ||
267 | allcorrect = false; | ||
268 | } | ||
257 | } | 269 | } |
258 | } | 270 | } |
259 | break; | 271 | |
272 | delete queryDate; | ||
273 | queryDate = 0l; | ||
274 | delete checkDate; | ||
275 | checkDate = 0l; | ||
276 | break; | ||
277 | default: | ||
278 | /* Just compare fields which are not empty in the query object */ | ||
279 | if ( !query.field(i).isEmpty() ){ | ||
280 | switch ( settings & ~( OContactAccess::IgnoreCase | ||
281 | | OContactAccess::DateDiff | ||
282 | | OContactAccess::DateYear | ||
283 | | OContactAccess::DateMonth | ||
284 | | OContactAccess::DateDay | ||
285 | | OContactAccess::MatchOne | ||
286 | ) ){ | ||
287 | |||
288 | case OContactAccess::RegExp:{ | ||
289 | QRegExp expr ( query.field(i), | ||
290 | !(settings & OContactAccess::IgnoreCase), | ||
291 | false ); | ||
292 | if ( expr.find ( (*it).field(i), 0 ) == -1 ) | ||
293 | allcorrect = false; | ||
294 | } | ||
295 | break; | ||
296 | case OContactAccess::WildCards:{ | ||
297 | QRegExp expr ( query.field(i), | ||
298 | !(settings & OContactAccess::IgnoreCase), | ||
299 | true ); | ||
300 | if ( expr.find ( (*it).field(i), 0 ) == -1 ) | ||
301 | allcorrect = false; | ||
302 | } | ||
303 | break; | ||
304 | case OContactAccess::ExactMatch:{ | ||
305 | if (settings & OContactAccess::IgnoreCase){ | ||
306 | if ( query.field(i).upper() != | ||
307 | (*it).field(i).upper() ) | ||
308 | allcorrect = false; | ||
309 | }else{ | ||
310 | if ( query.field(i) != (*it).field(i) ) | ||
311 | allcorrect = false; | ||
312 | } | ||
313 | } | ||
314 | break; | ||
315 | } | ||
260 | } | 316 | } |
261 | } | 317 | } |
262 | } | 318 | } |
@@ -291,18 +347,33 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
291 | const uint querySettings() | 347 | const uint querySettings() |
292 | { | 348 | { |
293 | return ( OContactAccess::WildCards | 349 | return ( OContactAccess::WildCards |
294 | & OContactAccess::IgnoreCase | 350 | | OContactAccess::IgnoreCase |
295 | & OContactAccess::RegExp | 351 | | OContactAccess::RegExp |
296 | & OContactAccess::ExactMatch ); | 352 | | OContactAccess::ExactMatch |
353 | | OContactAccess::DateDiff | ||
354 | | OContactAccess::DateYear | ||
355 | | OContactAccess::DateMonth | ||
356 | | OContactAccess::DateDay | ||
357 | ); | ||
297 | } | 358 | } |
298 | 359 | ||
299 | bool hasQuerySettings (uint querySettings) const | 360 | bool hasQuerySettings (uint querySettings) const |
300 | { | 361 | { |
301 | /* OContactAccess::IgnoreCase may be added with one | 362 | /* OContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay |
302 | * of the other settings, but never used alone. | 363 | * may be added with any of the other settings. IgnoreCase should never used alone. |
303 | * The other settings are just valid alone... | 364 | * Wildcards, RegExp, ExactMatch should never used at the same time... |
304 | */ | 365 | */ |
305 | switch ( querySettings & ~OContactAccess::IgnoreCase ){ | 366 | |
367 | if ( querySettings == OContactAccess::IgnoreCase ) | ||
368 | return false; | ||
369 | |||
370 | switch ( querySettings & ~( OContactAccess::IgnoreCase | ||
371 | | OContactAccess::DateDiff | ||
372 | | OContactAccess::DateYear | ||
373 | | OContactAccess::DateMonth | ||
374 | | OContactAccess::DateDay | ||
375 | ) | ||
376 | ){ | ||
306 | case OContactAccess::RegExp: | 377 | case OContactAccess::RegExp: |
307 | return ( true ); | 378 | return ( true ); |
308 | case OContactAccess::WildCards: | 379 | case OContactAccess::WildCards: |