Improved query by example: Search by date is possible.. First step

for a today plugin for birthdays..

4 files changed, 178 insertions, 20 deletions

diff --git a/libopie/pim/ocontactaccess.h b/libopie/pim/ocontactaccess.h
index 961968f..32b2dcb 100644
--- a/libopie/pim/ocontactaccess.h
+++ b/libopie/pim/ocontactaccess.h
@@ -8,24 +8,28 @@
  *	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: Define enum for query settings
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  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.5  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.4  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.3  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.2  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
@@ -79,25 +83,29 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
 	~OContactAccess ();
 
 	/** Constants for query.
 	 * Use this constants to set the query parameters.
 	 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes !
 	 * @see queryByExample()
 	 */
 	enum QuerySettings {
 		WildCards  = 0x0001,
 		IgnoreCase = 0x0002,
 		RegExp     = 0x0004,
 		ExactMatch = 0x0008,
-		MatchOne   = 0x0010  // Only one Entry must match
+		MatchOne   = 0x0010, // Only one Entry must match
+		DateDiff   = 0x0020, // Find all entries from today until given date
+		DateYear   = 0x0040, // The year matches
+		DateMonth  = 0x0080, // The month matches
+		DateDay    = 0x0100, // The day matches
 	};
 
 	
 	ORecordList<OContact> matchRegexp(  const QRegExp &r )const;
 
 	/** Return all Contacts in a sorted manner.
 	 *  @param ascending true: Sorted in acending order.
 	 *  @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
 	 *  @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
 	 *  @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
 	 */
 	List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index c765ff5..c6e6cbc 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -8,24 +8,28 @@
  *	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.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..
  *
@@ -51,24 +55,25 @@
  */
 
 #ifndef _OContactAccessBackend_XML_
 #define _OContactAccessBackend_XML_
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
+#include <qdatetime.h> 
 
 #include <qpe/global.h>
 
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #include <stdlib.h>
 #include <errno.h>
 
 using namespace Opie;
 
@@ -216,29 +221,79 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 		}
 	
 	QArray<int> queryByExample ( const OContact &query, int settings ){
 		
 		QArray<int> m_currentQuery( m_contactList.count() );
 		QValueListConstIterator<OContact> it;
 		uint arraycounter = 0;
 		
 		for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
 			/* Search all fields and compare them with query object. Store them into list
 			 * if all fields matches.
 			 */
+			QDate* queryDate = 0l;
+			QDate* checkDate = 0l;
 			bool allcorrect = true;
-			for ( int i = 0; i < Qtopia::rid; i++ ) {
+			for ( int i = 0; i < Qtopia::Groups; i++ ) {
+				// Birthday and anniversary are special nonstring fields and should
+				// be handled especially
+				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 ) ) )
+									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 ){
+						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 );
@@ -251,24 +306,25 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 							if ( query.field(i).upper() !=
 							     (*it).field(i).upper() )
 								allcorrect = false;
 						}else{
 							if ( query.field(i) != (*it).field(i) )
 								allcorrect = false;
 						}
 					}
 						break;
 					}
 				}
 			}
+			}
 			if ( allcorrect ){
 				m_currentQuery[arraycounter++] = (*it).uid();
 			}
 		}
 			
 		// Shrink to fit..
 		m_currentQuery.resize(arraycounter);
 	
 		return m_currentQuery;
 	}
 
 	QArray<int> matchRegexp(  const QRegExp &r ) const{
@@ -282,36 +338,51 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 			}
 			
 		}
 		// Shrink to fit..
 		m_currentQuery.resize(arraycounter);
 
 		return m_currentQuery;
 	}
 	
 	const uint querySettings()
 		{
 			return ( OContactAccess::WildCards
-				 & OContactAccess::IgnoreCase
-				 & OContactAccess::RegExp
-				 & OContactAccess::ExactMatch );
+				 | OContactAccess::IgnoreCase
+				 | OContactAccess::RegExp
+				 | OContactAccess::ExactMatch 
+				 | OContactAccess::DateDiff
+				 | OContactAccess::DateYear
+				 | OContactAccess::DateMonth
+				 | OContactAccess::DateDay
+				);
 		}
 	
 	bool hasQuerySettings (uint querySettings) const
 		{
-			/* OContactAccess::IgnoreCase may be added with one
-			 * of the other settings, but never used alone.
-			 * The other settings are just valid alone...
+			/* OContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay 
+			 * may be added with any of the other settings. IgnoreCase should never used alone.
+			 * Wildcards, RegExp, ExactMatch should never used at the same time...
 			 */
-			switch ( querySettings & ~OContactAccess::IgnoreCase ){
+
+			if ( querySettings == OContactAccess::IgnoreCase ) 
+				return false;
+
+			switch ( querySettings & ~( OContactAccess::IgnoreCase
+						    | OContactAccess::DateDiff
+						    | OContactAccess::DateYear
+						    | OContactAccess::DateMonth
+						    | OContactAccess::DateDay
+						  ) 
+			       ){
 			case OContactAccess::RegExp:
 				return ( true );
 			case OContactAccess::WildCards:
 				return ( true );
 			case OContactAccess::ExactMatch:
 				return ( true );
 			default:
 				return ( false );
 			}
 		}
 	
 	// Currently only asc implemented.. 
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
index c765ff5..c6e6cbc 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.h
@@ -8,24 +8,28 @@
  *	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.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..
  *
@@ -51,24 +55,25 @@
  */
 
 #ifndef _OContactAccessBackend_XML_
 #define _OContactAccessBackend_XML_
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
+#include <qdatetime.h> 
 
 #include <qpe/global.h>
 
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #include <stdlib.h>
 #include <errno.h>
 
 using namespace Opie;
 
@@ -216,29 +221,79 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 		}
 	
 	QArray<int> queryByExample ( const OContact &query, int settings ){
 		
 		QArray<int> m_currentQuery( m_contactList.count() );
 		QValueListConstIterator<OContact> it;
 		uint arraycounter = 0;
 		
 		for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
 			/* Search all fields and compare them with query object. Store them into list
 			 * if all fields matches.
 			 */
+			QDate* queryDate = 0l;
+			QDate* checkDate = 0l;
 			bool allcorrect = true;
-			for ( int i = 0; i < Qtopia::rid; i++ ) {
+			for ( int i = 0; i < Qtopia::Groups; i++ ) {
+				// Birthday and anniversary are special nonstring fields and should
+				// be handled especially
+				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 ) ) )
+									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 ){
+						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 );
@@ -251,24 +306,25 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 							if ( query.field(i).upper() !=
 							     (*it).field(i).upper() )
 								allcorrect = false;
 						}else{
 							if ( query.field(i) != (*it).field(i) )
 								allcorrect = false;
 						}
 					}
 						break;
 					}
 				}
 			}
+			}
 			if ( allcorrect ){
 				m_currentQuery[arraycounter++] = (*it).uid();
 			}
 		}
 			
 		// Shrink to fit..
 		m_currentQuery.resize(arraycounter);
 	
 		return m_currentQuery;
 	}
 
 	QArray<int> matchRegexp(  const QRegExp &r ) const{
@@ -282,36 +338,51 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
 			}
 			
 		}
 		// Shrink to fit..
 		m_currentQuery.resize(arraycounter);
 
 		return m_currentQuery;
 	}
 	
 	const uint querySettings()
 		{
 			return ( OContactAccess::WildCards
-				 & OContactAccess::IgnoreCase
-				 & OContactAccess::RegExp
-				 & OContactAccess::ExactMatch );
+				 | OContactAccess::IgnoreCase
+				 | OContactAccess::RegExp
+				 | OContactAccess::ExactMatch 
+				 | OContactAccess::DateDiff
+				 | OContactAccess::DateYear
+				 | OContactAccess::DateMonth
+				 | OContactAccess::DateDay
+				);
 		}
 	
 	bool hasQuerySettings (uint querySettings) const
 		{
-			/* OContactAccess::IgnoreCase may be added with one
-			 * of the other settings, but never used alone.
-			 * The other settings are just valid alone...
+			/* OContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay 
+			 * may be added with any of the other settings. IgnoreCase should never used alone.
+			 * Wildcards, RegExp, ExactMatch should never used at the same time...
 			 */
-			switch ( querySettings & ~OContactAccess::IgnoreCase ){
+
+			if ( querySettings == OContactAccess::IgnoreCase ) 
+				return false;
+
+			switch ( querySettings & ~( OContactAccess::IgnoreCase
+						    | OContactAccess::DateDiff
+						    | OContactAccess::DateYear
+						    | OContactAccess::DateMonth
+						    | OContactAccess::DateDay
+						  ) 
+			       ){
 			case OContactAccess::RegExp:
 				return ( true );
 			case OContactAccess::WildCards:
 				return ( true );
 			case OContactAccess::ExactMatch:
 				return ( true );
 			default:
 				return ( false );
 			}
 		}
 	
 	// Currently only asc implemented.. 
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index 961968f..32b2dcb 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -8,24 +8,28 @@
  *	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: Define enum for query settings
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  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.5  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.4  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.3  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.2  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
@@ -79,25 +83,29 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
 	~OContactAccess ();
 
 	/** Constants for query.
 	 * Use this constants to set the query parameters.
 	 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes !
 	 * @see queryByExample()
 	 */
 	enum QuerySettings {
 		WildCards  = 0x0001,
 		IgnoreCase = 0x0002,
 		RegExp     = 0x0004,
 		ExactMatch = 0x0008,
-		MatchOne   = 0x0010  // Only one Entry must match
+		MatchOne   = 0x0010, // Only one Entry must match
+		DateDiff   = 0x0020, // Find all entries from today until given date
+		DateYear   = 0x0040, // The year matches
+		DateMonth  = 0x0080, // The month matches
+		DateDay    = 0x0100, // The day matches
 	};
 
 	
 	ORecordList<OContact> matchRegexp(  const QRegExp &r )const;
 
 	/** Return all Contacts in a sorted manner.
 	 *  @param ascending true: Sorted in acending order.
 	 *  @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
 	 *  @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
 	 *  @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
 	 */
 	List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;