| -rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.h | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h index 6a1c91d..6477705 100644 --- a/libopie/pim/ocontactaccessbackend_xml.h +++ b/libopie/pim/ocontactaccessbackend_xml.h | |||
| @@ -14,12 +14,15 @@ | |||
| 14 | * | 14 | * |
| 15 | * ===================================================================== | 15 | * ===================================================================== |
| 16 | * Version: $Id$ | 16 | * Version: $Id$ |
| 17 | * ===================================================================== | 17 | * ===================================================================== |
| 18 | * History: | 18 | * History: |
| 19 | * $Log$ | 19 | * $Log$ |
| 20 | * Revision 1.12 2003/01/03 16:58:03 eilers | ||
| 21 | * Reenable debug output | ||
| 22 | * | ||
| 20 | * Revision 1.11 2003/01/03 12:31:28 eilers | 23 | * Revision 1.11 2003/01/03 12:31:28 eilers |
| 21 | * Bugfix for calculating data diffs.. | 24 | * Bugfix for calculating data diffs.. |
| 22 | * | 25 | * |
| 23 | * Revision 1.10 2003/01/02 14:27:12 eilers | 26 | * Revision 1.10 2003/01/02 14:27:12 eilers |
| 24 | * Improved query by example: Search by date is possible.. First step | 27 | * Improved query by example: Search by date is possible.. First step |
| 25 | * for a today plugin for birthdays.. | 28 | * for a today plugin for birthdays.. |
| @@ -264,26 +267,28 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
| 264 | allcorrect = false; | 267 | allcorrect = false; |
| 265 | } | 268 | } |
| 266 | if ( settings & OContactAccess::DateDiff ) { | 269 | if ( settings & OContactAccess::DateDiff ) { |
| 267 | QDate current = QDate::currentDate(); | 270 | QDate current = QDate::currentDate(); |
| 268 | // We have to equalize the year, otherwise | 271 | // We have to equalize the year, otherwise |
| 269 | // the search will fail.. | 272 | // the search will fail.. |
| 270 | checkDate->setYMD( current.year(), checkDate->month(), checkDate->day() ); | 273 | checkDate->setYMD( current.year(), |
| 274 | checkDate->month(), | ||
| 275 | checkDate->day() ); | ||
| 271 | if ( *checkDate < current ) | 276 | if ( *checkDate < current ) |
| 272 | checkDate->setYMD( current.year()+1, | 277 | checkDate->setYMD( current.year()+1, |
| 273 | checkDate->month(), | 278 | checkDate->month(), |
| 274 | checkDate->day() ); | 279 | checkDate->day() ); |
| 275 | // qWarning("Checking if %s is between %s and %s ! ", | 280 | qWarning("Checking if %s is between %s and %s ! ", |
| 276 | // checkDate->toString().latin1(), | 281 | checkDate->toString().latin1(), |
| 277 | // current.toString().latin1(), | 282 | current.toString().latin1(), |
| 278 | // queryDate->toString().latin1() ); | 283 | queryDate->toString().latin1() ); |
| 279 | if ( current.daysTo( *queryDate ) > 0 ){ | 284 | if ( current.daysTo( *queryDate ) > 0 ){ |
| 280 | if ( !( ( *checkDate >= current ) && | 285 | if ( !( ( *checkDate >= current ) && |
| 281 | ( *checkDate <= *queryDate ) ) ){ | 286 | ( *checkDate <= *queryDate ) ) ){ |
| 282 | allcorrect = false; | 287 | allcorrect = false; |
| 283 | //qWarning (" Nope!.."); | 288 | qWarning (" Nope!.."); |
| 284 | } | 289 | } |
| 285 | } | 290 | } |
| 286 | } | 291 | } |
| 287 | } else{ | 292 | } else{ |
| 288 | // checkDate is invalid. Therfore this entry is always rejected | 293 | // checkDate is invalid. Therfore this entry is always rejected |
| 289 | allcorrect = false; | 294 | allcorrect = false; |