summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp24
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.cpp75
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
@@ -222,4 +222,6 @@ void ODateBookAccessBackend_SQL::clear()
OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
+ qDebug( "ODateBookAccessBackend_SQL::find( %d )", uid );
+
QString qu = "select *";
qu += "from datebook where uid = " + QString::number(uid);
@@ -243,4 +245,6 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
OPimEvent retDate( dateEventMap );
retDate.setExtraMap( requestCustom( uid ) );
+
+ qDebug( "ODateBookAccessBackend_SQL::find() end", uid );
return retDate;
}
@@ -376,6 +380,22 @@ OPimEvent::ValueList ODateBookAccessBackend_SQL::directRawRepeats()
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 );
+
+
+
}
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
@@ -300,5 +300,6 @@ namespace {
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;
}
@@ -763,28 +764,27 @@ 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 {
@@ -807,6 +807,47 @@ QBitArray OPimTodoAccessBackendSQL::sup() const{
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() );
+ }
}