Diffstat (limited to 'libopie/pim/ocontactaccessbackend_xml.h') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.h | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h index c6e6cbc..6a1c91d 100644 --- a/libopie/pim/ocontactaccessbackend_xml.h +++ b/libopie/pim/ocontactaccessbackend_xml.h | |||
@@ -19,2 +19,5 @@ | |||
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.11 2003/01/03 12:31:28 eilers | ||
21 | * Bugfix for calculating data diffs.. | ||
22 | * | ||
20 | * Revision 1.10 2003/01/02 14:27:12 eilers | 23 | * Revision 1.10 2003/01/02 14:27:12 eilers |
@@ -237,3 +240,3 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
237 | // Birthday and anniversary are special nonstring fields and should | 240 | // Birthday and anniversary are special nonstring fields and should |
238 | // be handled especially | 241 | // be handled specially |
239 | switch ( i ){ | 242 | switch ( i ){ |
@@ -249,2 +252,3 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
249 | if ( queryDate->isValid() ){ | 252 | if ( queryDate->isValid() ){ |
253 | if( checkDate->isValid() ){ | ||
250 | if ( settings & OContactAccess::DateYear ){ | 254 | if ( settings & OContactAccess::DateYear ){ |
@@ -263,7 +267,24 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
263 | QDate current = QDate::currentDate(); | 267 | QDate current = QDate::currentDate(); |
268 | // We have to equalize the year, otherwise | ||
269 | // the search will fail.. | ||
270 | checkDate->setYMD( current.year(), checkDate->month(), checkDate->day() ); | ||
271 | if ( *checkDate < current ) | ||
272 | checkDate->setYMD( current.year()+1, | ||
273 | checkDate->month(), | ||
274 | checkDate->day() ); | ||
275 | // qWarning("Checking if %s is between %s and %s ! ", | ||
276 | // checkDate->toString().latin1(), | ||
277 | // current.toString().latin1(), | ||
278 | // queryDate->toString().latin1() ); | ||
264 | if ( current.daysTo( *queryDate ) > 0 ){ | 279 | if ( current.daysTo( *queryDate ) > 0 ){ |
265 | if ( !( ( *checkDate >= current ) && | 280 | if ( !( ( *checkDate >= current ) && |
266 | ( *checkDate <= *queryDate ) ) ) | 281 | ( *checkDate <= *queryDate ) ) ){ |
267 | allcorrect = false; | 282 | allcorrect = false; |
283 | //qWarning (" Nope!.."); | ||
284 | } | ||
285 | } | ||
268 | } | 286 | } |
287 | } else{ | ||
288 | // checkDate is invalid. Therfore this entry is always rejected | ||
289 | allcorrect = false; | ||
269 | } | 290 | } |