Fixing small bug: If we search a birthday from today to today, it returned

every contact ..

1 files changed, 5 insertions, 1 deletions

diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index 4abf4d9..9fe3d1e 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -1,67 +1,71 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.3  2003/03/21 12:26:28  eilers
+ * Fixing small bug: If we search a birthday from today to today, it returned
+ * every contact ..
+ *
  * Revision 1.2  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.1.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.1.2.1  2003/02/10 15:31:38  eilers
  * Writing offsets to debug output..
  *
  * Revision 1.1  2003/02/09 15:05:01  eilers
  * Nothing happened.. Just some cleanup before I will start..
  *
  * Revision 1.12  2003/01/03 16:58:03  eilers
  * Reenable debug output
  *
  * 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..
  *
  * Revision 1.8  2002/11/14 17:04:24  eilers
  * Sorting will now work if fullname is identical on some entries
  *
  * Revision 1.7  2002/11/13 15:02:46  eilers
  * Small Bug in sorted fixed
  *
  * Revision 1.6  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.5  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.4  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.3  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
@@ -280,97 +284,97 @@ QArray<int> OContactAccessBackend_XML::queryByExample ( const OContact &query, i
                                 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(  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;
                                                         // If we get an additional date, we
                                                         // will take this date instead of
                                                         // the current one.. 
                                                         if ( !d.date().isValid() )
                                                                 current = QDate::currentDate();
                                                         else
                                                                 current = d.date();
 
                                                         // 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() );
 
                                                         // Check whether the birthday/anniversary date is between
                                                         // the current/given date and the maximum date
                                                         // ( maximum time range ) !
                                                         qWarning("Checking if %s is between %s and %s ! ", 
                                                                  checkDate->toString().latin1(),
                                                                  current.toString().latin1(), 
                                                                  queryDate->toString().latin1() );
-                                                        if ( current.daysTo( *queryDate ) > 0 ){
+                                                        if ( current.daysTo( *queryDate ) >= 0 ){
                                                                 if ( !( ( *checkDate >= current ) && 
                                                                         ( *checkDate <= *queryDate ) ) ){
                                                                         allcorrect = false;
                                                                         qWarning (" Nope!..");
                                                                 }
                                                         }
                                                 }
                                         } else{
                                                 // checkDate is invalid. Therefore this entry is always rejected
                                                 allcorrect = false;
                                         }
                                 }
                                 
                                 delete queryDate;
                                 queryDate = 0l;
                                 delete checkDate;
                                 checkDate = 0l;
                                 break;
                         default:
                                 /* Just compare fields which are not empty in the query object */
                                 if ( !query.field(i).isEmpty() ){
                                         switch ( settings & ~( OContactAccess::IgnoreCase
                                                                | OContactAccess::DateDiff
                                                                | OContactAccess::DateYear
                                                                | OContactAccess::DateMonth
                                                                | OContactAccess::DateDay
                                                                | OContactAccess::MatchOne 
                                                                ) ){
                                                 
                                         case OContactAccess::RegExp:{
                                                 QRegExp expr ( query.field(i),
                                                                !(settings & OContactAccess::IgnoreCase),
                                                                false );
                                                 if ( expr.find ( (*it)->field(i), 0 ) == -1 )
                                                         allcorrect = false;
                                         }
                                                 break;
                                         case OContactAccess::WildCards:{
                                                 QRegExp expr ( query.field(i),
                                                                !(settings & OContactAccess::IgnoreCase),
                                                                true );
                                                 if ( expr.find ( (*it)->field(i), 0 ) == -1 )
                                                         allcorrect = false;
                                         }
                                                 break;
                                         case OContactAccess::ExactMatch:{
                                                 if (settings & OContactAccess::IgnoreCase){
                                                         if ( query.field(i).upper() !=