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

every contact ..

2 files changed, 10 insertions, 2 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
@@ -4,32 +4,36 @@
  * 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..
@@ -312,33 +316,33 @@ QArray<int> OContactAccessBackend_XML::queryByExample ( const OContact &query, i
 							// 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;
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 4abf4d9..9fe3d1e 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -4,32 +4,36 @@
  * 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..
@@ -312,33 +316,33 @@ QArray<int> OContactAccessBackend_XML::queryByExample ( const OContact &query, i
 							// 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;