| author | eilers <eilers> | 2003-01-03 12:31:28 (UTC) |
|---|---|---|
| committer | eilers <eilers> | 2003-01-03 12:31:28 (UTC) |
| commit | 54ebecbfd86a9ce6782dc55dad7ae15c73adef21 (patch) (side-by-side diff) | |
| tree | a3934153aafb2d5e05186a5965e45f6d4dc267ec | |
| parent | f1a3efd2d335b59aaa63bbf542abba524774b2d3 (diff) | |
| download | opie-54ebecbfd86a9ce6782dc55dad7ae15c73adef21.zip opie-54ebecbfd86a9ce6782dc55dad7ae15c73adef21.tar.gz opie-54ebecbfd86a9ce6782dc55dad7ae15c73adef21.tar.bz2 | |
Bugfix for calculating data diffs..
| -rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.h | 25 | ||||
| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.h | 25 |
2 files changed, 46 insertions, 4 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 @@ -17,6 +17,9 @@ * ===================================================================== * History: * $Log$ + * Revision 1.11 2003/01/03 12:31:28 eilers + * Bugfix for calculating data diffs.. + * * Revision 1.10 2003/01/02 14:27:12 eilers * Improved query by example: Search by date is possible.. First step * for a today plugin for birthdays.. @@ -235,7 +238,7 @@ class OContactAccessBackend_XML : public OContactAccessBackend { bool allcorrect = true; for ( int i = 0; i < Qtopia::Groups; i++ ) { // Birthday and anniversary are special nonstring fields and should - // be handled especially + // be handled specially switch ( i ){ case Qtopia::Birthday: queryDate = new QDate( query.birthday() ); @@ -247,6 +250,7 @@ class OContactAccessBackend_XML : public OContactAccessBackend { } if ( queryDate->isValid() ){ + if( checkDate->isValid() ){ if ( settings & OContactAccess::DateYear ){ if ( queryDate->year() != checkDate->year() ) allcorrect = false; @@ -261,11 +265,28 @@ class OContactAccessBackend_XML : public OContactAccessBackend { } if ( settings & OContactAccess::DateDiff ) { QDate current = QDate::currentDate(); + // We have to equalize the year, otherwise + // the search will fail.. + checkDate->setYMD( current.year(), checkDate->month(), checkDate->day() ); + if ( *checkDate < current ) + checkDate->setYMD( current.year()+1, + checkDate->month(), + checkDate->day() ); + // qWarning("Checking if %s is between %s and %s ! ", + // checkDate->toString().latin1(), + // current.toString().latin1(), + // queryDate->toString().latin1() ); if ( current.daysTo( *queryDate ) > 0 ){ if ( !( ( *checkDate >= current ) && - ( *checkDate <= *queryDate ) ) ) + ( *checkDate <= *queryDate ) ) ){ allcorrect = false; + //qWarning (" Nope!.."); + } + } } + } else{ + // checkDate is invalid. Therfore this entry is always rejected + allcorrect = false; } } diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h index c6e6cbc..6a1c91d 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h @@ -17,6 +17,9 @@ * ===================================================================== * History: * $Log$ + * Revision 1.11 2003/01/03 12:31:28 eilers + * Bugfix for calculating data diffs.. + * * Revision 1.10 2003/01/02 14:27:12 eilers * Improved query by example: Search by date is possible.. First step * for a today plugin for birthdays.. @@ -235,7 +238,7 @@ class OContactAccessBackend_XML : public OContactAccessBackend { bool allcorrect = true; for ( int i = 0; i < Qtopia::Groups; i++ ) { // Birthday and anniversary are special nonstring fields and should - // be handled especially + // be handled specially switch ( i ){ case Qtopia::Birthday: queryDate = new QDate( query.birthday() ); @@ -247,6 +250,7 @@ class OContactAccessBackend_XML : public OContactAccessBackend { } if ( queryDate->isValid() ){ + if( checkDate->isValid() ){ if ( settings & OContactAccess::DateYear ){ if ( queryDate->year() != checkDate->year() ) allcorrect = false; @@ -261,11 +265,28 @@ class OContactAccessBackend_XML : public OContactAccessBackend { } if ( settings & OContactAccess::DateDiff ) { QDate current = QDate::currentDate(); + // We have to equalize the year, otherwise + // the search will fail.. + checkDate->setYMD( current.year(), checkDate->month(), checkDate->day() ); + if ( *checkDate < current ) + checkDate->setYMD( current.year()+1, + checkDate->month(), + checkDate->day() ); + // qWarning("Checking if %s is between %s and %s ! ", + // checkDate->toString().latin1(), + // current.toString().latin1(), + // queryDate->toString().latin1() ); if ( current.daysTo( *queryDate ) > 0 ){ if ( !( ( *checkDate >= current ) && - ( *checkDate <= *queryDate ) ) ) + ( *checkDate <= *queryDate ) ) ){ allcorrect = false; + //qWarning (" Nope!.."); + } + } } + } else{ + // checkDate is invalid. Therfore this entry is always rejected + allcorrect = false; } } |