Bugfix for calculating data diffs..

1 files changed, 39 insertions, 18 deletions

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
@@ -14,12 +14,15 @@
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * 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..
  *
  * Revision 1.9  2002/12/08 12:48:57  eilers
  * Moved journal-enum from ocontact into i the xml-backend..
@@ -232,43 +235,61 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
                          */
                         QDate* queryDate = 0l;
                         QDate* checkDate = 0l;
                         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() );
                                         checkDate = new QDate( (*it).birthday() );
                                 case Qtopia::Anniversary:
                                         if ( queryDate == 0l ){
                                                 queryDate = new QDate( query.anniversary() );
                                                 checkDate = new QDate( (*it).anniversary() );
                                         }
                                         
                                         if ( queryDate->isValid() ){
-                                                if ( settings & OContactAccess::DateYear ){
-                                                        if ( queryDate->year() != checkDate->year() )
-                                                                allcorrect = false;
-                                                } 
-                                                if ( settings & OContactAccess::DateMonth ){
-                                                        if ( queryDate->month() != checkDate->month() )
-                                                                allcorrect = false;
-                                                } 
-                                                if ( settings & OContactAccess::DateDay ){
-                                                        if ( queryDate->day() != checkDate->day() )
-                                                                allcorrect = false;
-                                                } 
-                                                if ( settings & OContactAccess::DateDiff ) {
-                                                        QDate current = QDate::currentDate();
-                                                        if ( current.daysTo( *queryDate ) > 0 ){
-                                                                if ( !( ( *checkDate >= current ) && 
-                                                                        ( *checkDate <= *queryDate ) ) )
+                                                if(  checkDate->isValid() ){
+                                                        if ( settings & OContactAccess::DateYear ){
+                                                                if ( queryDate->year() != checkDate->year() )
+                                                                        allcorrect = false;
+                                                        } 
+                                                        if ( settings & OContactAccess::DateMonth ){
+                                                                if ( queryDate->month() != checkDate->month() )
+                                                                        allcorrect = false;
+                                                        } 
+                                                        if ( settings & OContactAccess::DateDay ){
+                                                                if ( queryDate->day() != checkDate->day() )
                                                                         allcorrect = false;
+                                                        } 
+                                                        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 ) ) ){
+                                                                                allcorrect = false;
+                                                                                //qWarning (" Nope!..");
+                                                                        }
+                                                                }
                                                         }
+                                                } else{
+                                                        // checkDate is invalid. Therfore this entry is always rejected
+                                                        allcorrect = false;
                                                 }
                                         }
 
                                         delete queryDate;
                                         queryDate = 0l;
                                         delete checkDate;