3 files changed, 36 insertions, 20 deletions

diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index d255c66..ebd03bb 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -1,23 +1,26 @@
 
 #include <qdatetime.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include "otodoaccesssql.h"
+#include "opimstate.h"
+#include "opimnotifymanager.h"
+#include "orecur.h"
 
 /*
  * first some query
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
     /**
      * CreateQuery for the Todolist Table
@@ -111,25 +114,26 @@ namespace {
         QDate m_start;
         QDate m_end;
         bool m_inc :1;
     };
 
 
     CreateQuery::CreateQuery() : OSQLQuery() {}
     CreateQuery::~CreateQuery() {}
     QString CreateQuery::query()const {
         QString qu;
         qu += "create table todolist( uid PRIMARY KEY, categories, completed, ";
         qu += "description, summary, priority, DueDate, progress ,  state, ";
-        qu += "Recurrence, notifiers, maintainer, startdate, completeddate)";
+        qu += "Recurrence, reminders, alarms, maintainer, startdate, completeddate);";
+        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
         return qu;
     }
 
     LoadQuery::LoadQuery() : OSQLQuery() {}
     LoadQuery::~LoadQuery() {}
     QString LoadQuery::query()const {
         QString qu;
         // We do not need "distinct" here. The primary key is always unique..
         //qu += "select distinct uid from todolist";
         qu += "select uid from todolist";
 
         return qu;
@@ -172,32 +176,41 @@ namespace {
         QString qu;
         qu  = "insert into todolist VALUES(" 
                 +  QString::number( m_todo.uid() ) + "," 
                 + "'" + m_todo.idsToString( m_todo.categories() ) + "'" + ","
                 +       QString::number( m_todo.isCompleted() )         + ","  
                 + "'" + m_todo.description()                      + "'" + ","
                 + "'" + m_todo.summary()                          + "'" + "," 
                 +       QString::number(m_todo.priority() )             + ","
                 + "'" + QString::number(year) + "-" 
                 +       QString::number(month)
                 +       "-" + QString::number( day )              + "'" + ","
                 +       QString::number( m_todo.progress() )            + ","
-                + "''"                                                  + "," // state (conversion needed)
-        //      +       QString::number( m_todo.state() )               + ","
-                + "''"                                                  + "," // Recurrence (conversion needed)
-                + "''"                                                  + "," // Notifiers (conversion needed)
-                + "''"                                                  + "," // Maintainers (conversion needed)
+                +       QString::number( m_todo.state().state() )       + ","
+                + "'" + m_todo.recurrence().toString()            + "'"+ ",";
+        
+        if ( m_todo.hasNotifiers() ) {
+                OPimNotifyManager manager = m_todo.notifiers();
+                        qu += "'" + manager.remindersToString()           + "'" + ","   
+                        + "'" + manager.alarmsToString()          + "'" + ",";
+        }
+        else{
+                qu += QString( "''" )                                   + ","
+                        + "''"                                          + ",";
+        }
+
+        qu +=   QString( "''" )                             + QString( "," ) // Maintainers (cur. not supported !)
                 + "'" + QString::number(sYear) + "-" 
-                      + QString::number(sMonth)
-                +       "-" + QString::number(sDay)               + "'" + ","
+                + QString::number(sMonth)
+                + "-" + QString::number(sDay)                     + "'" + ","
                 + "'" + QString::number(eYear) + "-"
                 +       QString::number(eMonth)
                 +       "-"+QString::number(eDay)                 + "'"
                 + ")";
 
         qWarning("add %s", qu.latin1() );
         return qu;
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
     RemoveQuery::~RemoveQuery() {}
@@ -521,24 +534,35 @@ OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     if ( isOk )
             to.setPriority( prioInt );
 
     bool hasStartDate = false; QDate startDate = QDate::currentDate();
     hasStartDate = date( startDate, item.data("startdate") );
     bool hasCompletedDate = false; QDate completedDate = QDate::currentDate();
     hasCompletedDate = date( completedDate, item.data("completeddate") );
 
     if ( hasStartDate )
             to.setStartDate( startDate );
     if ( hasCompletedDate )
             to.setCompletedDate( completedDate );
+    
+    OPimNotifyManager& manager = to.notifiers();
+    manager.alarmsFromString( item.data("alarms") );
+    manager.remindersFromString( item.data("reminders") );
+
+    OPimState pimState;
+    pimState.setState( QString( item.data("state") ).toInt() );
+    to.setState( pimState );
+
+    // Recurrence not supported yet
+    // to.setRecurrence( 
 
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( int uid )const {
     FindQuery find( uid );
     return todo( m_driver->query(&find) );
 }
 /*
  * update the dict
  */
 void OTodoAccessBackendSQL::fillDict() {
     /* initialize dict */
@@ -612,36 +636,28 @@ QArray<int> OTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
 
         }
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 #endif
         QArray<int> empty;
         return empty;
 }
 QBitArray OTodoAccessBackendSQL::supports()const {
 
-        QBitArray ar( OTodo::CompletedDate + 1 );
-        ar.fill( true );
-        ar[OTodo::CrossReference] = false;
-        ar[OTodo::State ] = false;
-        ar[OTodo::Reminders] = false;
-        ar[OTodo::Notifiers] = false;
-        ar[OTodo::Maintainer] = false;
-
-        return ar;
+        return sup();
 }
 
-QBitArray OTodoAccessBackendSQL::sup() {
+QBitArray OTodoAccessBackendSQL::sup() const{
 
         QBitArray ar( OTodo::CompletedDate + 1 );
         ar.fill( true );
         ar[OTodo::CrossReference] = false;
         ar[OTodo::State ] = false;
         ar[OTodo::Reminders] = false;
         ar[OTodo::Notifiers] = false;
         ar[OTodo::Maintainer] = false;
         
         return ar;
 }
 
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index 77d8b77..1c55567 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -35,22 +35,22 @@ public:
     QArray<int> matchRegexp(  const QRegExp &r ) const;
     void removeAllCompleted();
     
 
 private:
     void update()const;
     void fillDict();
     inline bool date( QDate& date, const QString& )const;
     inline OTodo todo( const OSQLResult& )const;
     inline OTodo todo( OSQLResultItem& )const;
     inline QArray<int> uids( const OSQLResult& )const;
     OTodo todo( int uid )const;
-    QBitArray sup();
+    QBitArray sup() const;
 
     QAsciiDict<int> m_dict;
     OSQLDriver* m_driver;
     QArray<int> m_uids;
     bool m_dirty : 1;
 };
 
 
 #endif
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index f688735..4a5cb33 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -559,25 +559,25 @@ QString OTodoAccessXML::toString( const OTodo& ev )const {
     if ( ev.hasRecurrence() ) {
         str += ev.recurrence().toString();
     }
     if ( ev.hasStartDate() )
         str += "StartDate=\""+ OConversion::dateToString( ev.startDate() ) +"\" ";
     if ( ev.hasCompletedDate() )
         str += "CompletedDate=\""+ OConversion::dateToString( ev.completedDate() ) +"\" ";
     if ( ev.hasState() )
         str += "State=\""+QString::number( ev.state().state() )+"\" ";
 
     /*
      * save reminders and notifiers!
-     * DATE_TIME:DURATION:SOUND:NOT_USED_YET;OTHER_DATE_TIME:OTHER:DURATION:SOUND:....
+     * DATE_TIME:DURATION:SOUND:NOT_USED_YET;OTHER_DATE_TIME:OTHER_DURATION:SOUND:....
      */
     if ( ev.hasNotifiers() ) {
         OPimNotifyManager manager = ev.notifiers();
         OPimNotifyManager::Alarms alarms = manager.alarms();
         if (!alarms.isEmpty() ) {
             QStringList als;
             OPimNotifyManager::Alarms::Iterator it = alarms.begin();
             for ( ; it != alarms.end(); ++it ) {
                 /* only if time is valid */
                 if ( (*it).dateTime().isValid() ) {
                     als << OConversion::dateTimeToString( (*it).dateTime() )
                         + ":" + QString::number( (*it).duration() )