Implementing regexp search. OSearch works now..

todo: Implemented removal of finished todo items..

2 files changed, 80 insertions, 19 deletions

diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index 8a8cb0b..495a8dd 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -218,12 +218,14 @@ void ODateBookAccessBackend_SQL::clear()
 
 	reload();
 }
 
 
 OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
+	qDebug( "ODateBookAccessBackend_SQL::find( %d )", uid ); 
+
 	QString qu = "select *";
 	qu += "from datebook where uid = " + QString::number(uid);
 
 	OSQLRawQuery raw( qu );
 	OSQLResult res = m_driver->query( &raw );
 
@@ -239,12 +241,14 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
 		dateEventMap.insert( m_reverseFieldMap[*it], resItem.data( *it ) );
 	}
 
 	// Last step: Put map into date event, add custom map and return it
 	OPimEvent retDate( dateEventMap );
 	retDate.setExtraMap( requestCustom( uid ) );
+
+	qDebug( "ODateBookAccessBackend_SQL::find() end", uid ); 
 	return retDate;
 }
 
 // FIXME: Speed up update of uid's..
 bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev ) 
 {
@@ -372,14 +376,30 @@ OPimEvent::ValueList ODateBookAccessBackend_SQL::directRawRepeats()
 	return list;
 }
 
 
 QArray<int> ODateBookAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
 {
-	QArray<int> null;
-	return null;
+
+	QString qu = "SELECT uid FROM datebook WHERE (";
+
+	// Do it make sense to search other fields, too ?
+	qu += " rlike(\""+ r.pattern() + "\", Location ) OR";
+	qu += " rlike(\""+ r.pattern() + "\", Note )";
+		
+	qu += " )";
+
+	qDebug( "query: %s", qu.latin1() );
+
+	OSQLRawQuery raw( qu );
+	OSQLResult res = m_driver->query( &raw );
+
+	return extractUids( res );
+
+
+
 }
 
 /* ===== Private Functions ========================================== */
 
 QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index b4170fc..ef036d5 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -296,13 +296,14 @@ namespace {
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
     RemoveQuery::~RemoveQuery() {}
     QString RemoveQuery::query()const {
-        QString qu = "DELETE from todolist where uid = " + QString::number(m_uid);
+        QString qu = "DELETE FROM todolist WHERE uid = " + QString::number(m_uid) + " ;";
+	qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid);
         return qu;
     }
 
 
     ClearQuery::ClearQuery()
         : OSQLQuery() {}
@@ -759,36 +760,35 @@ QArray<int> OPimTodoAccessBackendSQL::uids( const OSQLResult& res) const{
     return ints;
 }
 
 QArray<int> OPimTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
 {
 
-#warning OPimTodoAccessBackendSQL::matchRegexp() not implemented !!
-
 #if 0
+	QArray<int> empty;
+	return empty;
 
-	Copied from xml-backend by not adapted to sql (eilers)
+#else
+	QString qu = "SELECT uid FROM todolist WHERE (";
 
-	QArray<int> m_currentQuery( m_events.count() );
-	uint arraycounter = 0;
+	// Do it make sense to search other fields, too ?
+	qu += " rlike(\""+ r.pattern() + "\",\"description\") OR";
+	qu += " rlike(\""+ r.pattern() + "\",\"summary\")";
+		
+	qu += ")";
 
+	qDebug( "query: %s", qu.latin1() );
 
+	OSQLRawQuery raw( qu );
+	OSQLResult res = m_driver->query( &raw );
 
-        QMap<int, OPimTodo>::ConstIterator it;
-        for (it = m_events.begin(); it != m_events.end(); ++it ) {
-		if ( it.data().match( r ) )
-			m_currentQuery[arraycounter++] = it.data().uid();
+	return uids( res );
 
-	}
-	// Shrink to fit..
-	m_currentQuery.resize(arraycounter);
 
-	return m_currentQuery;
 #endif
-	QArray<int> empty;
-	return empty;
+
 }
 QBitArray OPimTodoAccessBackendSQL::supports()const {
 
 	return sup();
 }
 
@@ -803,14 +803,55 @@ QBitArray OPimTodoAccessBackendSQL::sup() const{
 	ar[OPimTodo::Maintainer] = false;
 	
 	return ar;
 }
 
 void OPimTodoAccessBackendSQL::removeAllCompleted(){
-#warning OPimTodoAccessBackendSQL::removeAllCompleted() not implemented !!
+	// First we need the uids from all entries which are 
+	// completed. Then, we just have to remove them...
+
+	QString qu = "SELECT uid FROM todolist WHERE completed = 1";
+
+	OSQLRawQuery raw( qu );
+	OSQLResult res = m_driver->query( &raw );
+
+	QArray<int> completed_uids = uids( res );
 
+	qDebug( "Number of completed: %d", completed_uids.size() );
+
+	if ( completed_uids.size() == 0 )
+		return;
+
+	qu = "DELETE FROM todolist WHERE (";
+	QString query;
+
+	for ( int i = 0; i < completed_uids.size(); i++ ){
+		if ( !query.isEmpty() )
+			query += " OR ";
+		query += QString( "uid = %1" ).arg( completed_uids[i] );
+	}
+	qu += query + " );";
+
+	// Put remove of custom entries in this query to speed up..
+ 	qu += "DELETE FORM custom_data WHERE (";
+ 	query = "";
+
+	for ( int i = 0; i < completed_uids.size(); i++ ){
+		if ( !query.isEmpty() )
+			query += " OR ";
+		query += QString( "uid = %1" ).arg( completed_uids[i] );
+	}
+	qu += query + " );";
+
+	qDebug( "query: %s", qu.latin1() );
+
+	OSQLRawQuery raw2( qu );
+	res = m_driver->query( &raw2 );
+	if ( res.state() == OSQLResult::Failure ) {
+		qWarning("OPimTodoAccessBackendSQL::removeAllCompleted():Failure in query: %s", qu.latin1() );
+	}
 }
 
 
 QMap<QString, QString>  OPimTodoAccessBackendSQL::requestCustom( int uid ) const
 {
 	QMap<QString, QString> customMap;