| -rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.h | 17 | ||||
| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.h | 17 |
2 files changed, 22 insertions, 12 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 | |||
| @@ -18,4 +18,7 @@ | |||
| 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.. |
| @@ -268,18 +271,20 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
| 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 | } |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h index 6a1c91d..6477705 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h | |||
| @@ -18,4 +18,7 @@ | |||
| 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.. |
| @@ -268,18 +271,20 @@ class OContactAccessBackend_XML : public OContactAccessBackend { | |||
| 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 | } |