5 files changed, 448 insertions, 5 deletions

diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
new file mode 100644
index 0000000..209e714
--- a/dev/null
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -0,0 +1,397 @@
+
+#include <qdatetime.h>
+
+#include <qpe/global.h>
+
+#include <opie/osqldriver.h>
+#include <opie/osqlresult.h>
+#include <opie/osqlmanager.h>
+#include <opie/osqlquery.h>
+
+#include "otodoaccesssql.h"
+
+/*
+ * first some query
+ * CREATE query
+ * LOAD query
+ * INSERT
+ * REMOVE
+ * CLEAR
+ */
+namespace {
+    /**
+     * CreateQuery for the Todolist Table
+     */
+    class CreateQuery : public OSQLQuery {
+    public:
+        CreateQuery();
+        ~CreateQuery();
+        QString query()const;
+    };
+
+    /**
+     * LoadQuery
+     * this one queries for all uids
+     */
+    class LoadQuery : public OSQLQuery {
+    public:
+        LoadQuery();
+        ~LoadQuery();
+        QString query()const;
+    };
+
+    /**
+     * inserts/adds a OTodo to the table
+     */
+    class InsertQuery : public OSQLQuery {
+    public:
+        InsertQuery(const OTodo& );
+        ~InsertQuery();
+        QString query()const;
+    private:
+        OTodo m_todo;
+    };
+
+    /**
+     * removes one from the table
+     */
+    class RemoveQuery : public OSQLQuery {
+    public:
+        RemoveQuery(int uid );
+        ~RemoveQuery();
+        QString query()const;
+    private:
+        int m_uid;
+    };
+
+    /**
+     * Clears (delete) a Table
+     */
+    class ClearQuery : public OSQLQuery {
+    public:
+        ClearQuery();
+        ~ClearQuery();
+        QString query()const;
+
+    };
+
+    /**
+     * a find query
+     */
+    class FindQuery : public OSQLQuery {
+    public:
+        FindQuery(int uid);
+        ~FindQuery();
+        QString query()const;
+    private:
+        int m_uid;
+    };
+
+    /**
+     * overdue query
+     */
+    class OverDueQuery : public OSQLQuery {
+    public:
+        OverDueQuery();
+        ~OverDueQuery();
+        QString query()const;
+    };
+    class EffQuery : public OSQLQuery {
+    public:
+        EffQuery( const QDate&, const QDate&, bool inc );
+        ~EffQuery();
+        QString query()const;
+    private:
+        QString with()const;
+        QString out()const;
+        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, categories, completed, progress, ";
+        qu += "summary, DueDate, priority, description )";
+        return qu;
+    }
+
+    LoadQuery::LoadQuery() : OSQLQuery() {}
+    LoadQuery::~LoadQuery() {}
+    QString LoadQuery::query()const {
+        QString qu;
+        qu += "select distinct uid from todolist";
+
+        return qu;
+    }
+
+    InsertQuery::InsertQuery( const OTodo& todo )
+        : OSQLQuery(), m_todo( todo ) {
+    }
+    InsertQuery::~InsertQuery() {
+    }
+    /*
+     * converts from a OTodo to a query
+     * we leave out X-Ref + Alarms
+     */
+    QString InsertQuery::query()const{
+        int year, month, day;
+        year = month = day = 0;
+        if (m_todo.hasDueDate() ) {
+            QDate date = m_todo.dueDate();
+            year = date.year();
+            month = date.month();
+            day = date.day();
+        }
+        QString qu;
+        qu  = "insert into todolist VALUES(" +  QString::number( m_todo.uid() ) + ",'" + m_todo.idsToString( m_todo.categories() ) + "',";
+        qu += QString::number( m_todo.isCompleted() ) + "," + QString::number( m_todo.progress() ) + ",";
+        qu += "'"+m_todo.summary()+"','"+QString::number(year)+"-"+QString::number(month)+"-"+QString::number(day)+"',";
+        qu += QString::number(m_todo.priority() ) +",'" + m_todo.description() + "')";
+
+        qWarning("add %s", qu.latin1() );
+        return qu;
+    }
+
+    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);
+        return qu;
+    }
+
+
+    ClearQuery::ClearQuery()
+        : OSQLQuery() {}
+    ClearQuery::~ClearQuery() {}
+    QString ClearQuery::query()const {
+        QString qu = "drop table todolist";
+        return qu;
+    }
+    FindQuery::FindQuery(int uid)
+        : OSQLQuery(), m_uid(uid ) {
+    }
+    FindQuery::~FindQuery() {
+    }
+    QString FindQuery::query()const{
+        QString qu = "select uid, categories, completed, progress, summary, ";
+        qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid);
+        return qu;
+    }
+
+    OverDueQuery::OverDueQuery(): OSQLQuery() {}
+    OverDueQuery::~OverDueQuery() {}
+    QString OverDueQuery::query()const {
+        QDate date = QDate::currentDate();
+        QString str;
+        str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() );
+
+        return str;
+    }
+
+
+    EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc )
+        : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {}
+    EffQuery::~EffQuery() {}
+    QString EffQuery::query()const {
+        return m_inc ? with() : out();
+    }
+    QString EffQuery::with()const {
+        QString str;
+        str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ")
+            .arg( m_start.year() ).arg( m_start.month() ).arg( m_start.day() )
+            .arg( m_end  .year() ).arg( m_end  .month() ).arg( m_end  .day() );
+        return str;
+    }
+    QString EffQuery::out()const {
+        QString str;
+        str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND  DueDate <= '%4-%5-%6'")
+            .arg(m_start.year() ).arg(m_start.month() ).arg( m_start.day() )
+            .arg(m_end.  year() ).arg(m_end.  month() ).arg(m_end.day() );
+
+        return str;
+    }
+};
+
+OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file )
+    : OTodoAccessBackend(), m_dict(15)
+{
+    QString fi = file;
+    if ( fi.isEmpty() )
+        fi = Global::applicationFileName( "todolist", "todolist.db" );
+    OSQLManager man;
+    m_driver = man.standard();
+    m_driver->setUrl(fi);
+    fillDict();
+}
+
+OTodoAccessBackendSQL::~OTodoAccessBackendSQL(){
+}
+bool OTodoAccessBackendSQL::load(){
+    if (!m_driver->open() )
+        return false;
+
+    CreateQuery creat;
+    OSQLResult res = m_driver->query(&creat );
+
+    update();
+    qWarning("loaded %d", m_uids.count() );
+    return true;
+}
+bool OTodoAccessBackendSQL::reload(){
+    return load();
+}
+
+bool OTodoAccessBackendSQL::save(){
+    return m_driver->close();
+}
+QArray<int> OTodoAccessBackendSQL::allRecords()const {
+    return m_uids;
+}
+QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int  ){
+    QArray<int> ints(0);
+    return ints;
+}
+OTodo OTodoAccessBackendSQL::find(int uid ) const{
+    FindQuery query( uid );
+    return todo( m_driver->query(&query) );
+
+}
+void OTodoAccessBackendSQL::clear() {
+    ClearQuery cle;
+    OSQLResult res = m_driver->query( &cle );
+    CreateQuery qu;
+    res = m_driver->query(&qu);
+}
+bool OTodoAccessBackendSQL::add( const OTodo& t) {
+    InsertQuery ins( t );
+    OSQLResult res = m_driver->query( &ins );
+
+    if ( res.state() == OSQLResult::Failure )
+        return false;
+    int c = m_uids.count();
+    m_uids.resize( c+1 );
+    m_uids[c] = t.uid();
+
+    return true;
+}
+bool OTodoAccessBackendSQL::remove( int uid ) {
+    RemoveQuery rem( uid );
+    OSQLResult res = m_driver->query(&rem );
+
+    if ( res.state() == OSQLResult::Failure )
+        return false;
+
+    update();
+    return true;
+}
+/*
+ * FIXME better set query
+ * but we need the cache for that
+ * now we remove
+ */
+bool OTodoAccessBackendSQL::replace( const OTodo& t) {
+    remove( t.uid() );
+    return add(t);
+}
+QArray<int> OTodoAccessBackendSQL::overDue() {
+    OverDueQuery qu;
+    return uids( m_driver->query(&qu ) );
+}
+QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
+                                                   const QDate& t,
+                                                   bool u) {
+    EffQuery ef(s, t, u );
+    return uids (m_driver->query(&ef) );
+}
+QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
+                                           int sortFilter, int cat ) {
+    QArray<int> ints(0);
+    return ints;
+}
+bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
+    if ( str == "0-0-0" )
+        return false;
+    else{
+        int day, year, month;
+        QStringList list = QStringList::split("-", str );
+        year = list[0].toInt();
+        month = list[1].toInt();
+        day = list[2].toInt();
+        da.setYMD( year, month, day );
+        return true;
+    }
+}
+OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{
+    if ( res.state() == OSQLResult::Failure ) {
+        OTodo to;
+        return to;
+    }
+
+    OSQLResultItem::ValueList list = res.results();
+    OSQLResultItem::ValueList::Iterator it = list.begin();
+
+    bool has = false; QDate da = QDate::currentDate();
+    has = date( da, (*it).data("DueDate") );
+    QStringList cats = QStringList::split(";", (*it).data("categories") );
+
+    OTodo to( (bool)(*it).data("completed").toInt(), (*it).data("priority").toInt(),
+              cats, (*it).data("summary"), (*it).data("description"),
+              (*it).data("progress").toUShort(), has, da, (*it).data("uid").toInt() );
+    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 */
+    /*
+     * UPDATE dict if you change anything!!!
+     */
+    m_dict.setAutoDelete( TRUE );
+    m_dict.insert("Categories" ,     new int(OTodo::Category)         );
+    m_dict.insert("Uid" ,            new int(OTodo::Uid)              );
+    m_dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
+    m_dict.insert("Completed" ,      new int(OTodo::Completed)        );
+    m_dict.insert("Description" ,    new int(OTodo::Description)      );
+    m_dict.insert("Summary" ,        new int(OTodo::Summary)          );
+    m_dict.insert("Priority" ,       new int(OTodo::Priority)         );
+    m_dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
+    m_dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
+    m_dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
+    m_dict.insert("Progress" ,       new int(OTodo::Progress)         );
+    m_dict.insert("Completed",       new int(OTodo::Completed)        );
+    m_dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
+    m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) );
+    m_dict.insert("AlarmDateTime",   new int(OTodo::AlarmDateTime)    );
+}
+void OTodoAccessBackendSQL::update() {
+    LoadQuery lo;
+    OSQLResult res = m_driver->query(&lo);
+    if ( res.state() != OSQLResult::Success )
+        return;
+
+    m_uids = uids( res );
+}
+QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
+
+    OSQLResultItem::ValueList list = res.results();
+    OSQLResultItem::ValueList::Iterator it;
+    QArray<int> ints(list.count() );
+
+    int i = 0;
+    for (it = list.begin(); it != list.end(); ++it ) {
+        ints[i] =  (*it).data("uid").toInt();
+        i++;
+    }
+    return ints;
+}
+
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
new file mode 100644
index 0000000..966628d
--- a/dev/null
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -0,0 +1,46 @@
+#ifndef OPIE_PIM_ACCESS_SQL_H
+#define OPIE_PIM_ACCESS_SQL_H
+
+#include <qasciidict.h>
+
+#include "otodoaccessbackend.h"
+
+class OSQLDriver;
+class OSQLResult;
+class OTodoAccessBackendSQL : public OTodoAccessBackend {
+public:
+    OTodoAccessBackendSQL( const QString& file );
+    ~OTodoAccessBackendSQL();
+
+    bool load();
+    bool reload();
+    bool save();
+    QArray<int> allRecords()const;
+
+    QArray<int> queryByExample( const OTodo& t, int sort );
+    OTodo find(int uid)const;
+    void clear();
+    bool add( const OTodo& t );
+    bool remove( int uid );
+    bool replace( const OTodo& t );
+
+    QArray<int> overDue();
+    QArray<int> effectiveToDos( const QDate& start,
+                                const QDate& end, bool includeNoDates );
+    QArray<int> sorted(bool asc, int sortOrder, int sortFilter, int cat );
+
+private:
+    void update();
+    void fillDict();
+    bool date( QDate& date, const QString& )const;
+    OTodo todo( const OSQLResult& )const;
+    QArray<int> uids( const OSQLResult& )const;
+    OTodo todo( int uid )const;
+
+    QAsciiDict<int> m_dict;
+    OSQLDriver* m_driver;
+    QArray<int> m_uids;
+};
+
+
+#endif
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 31822d4..80b8599 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -98,48 +98,49 @@ bool OTodoAccessXML::load() {
                 i = j + 1;
                 continue;
             }
 
             QCString value( dt+i, j-i+1 );
             i = j + 1;
 
             QString str = (haveUtf ? QString::fromUtf8( value )
                     : QString::fromLatin1( value ) );
             if ( haveEnt )
                 str = Qtopia::plainString( str );
 
             /*
              * add key + value
              */
             todo( &dict, ev, attr, str );
 
         }
         /*
          * now add it
          */
         m_events.insert(ev.uid(), ev );
     }
 
+    qWarning("counts %d", m_events.count() );
     return true;
 }
 bool OTodoAccessXML::reload() {
     return load();
 }
 bool OTodoAccessXML::save() {
 //    qWarning("saving");
     if (!m_opened || !m_changed ) {
 //        qWarning("not saving");
         return true;
     }
     QString strNewFile = m_file + ".new";
     QFile f( strNewFile );
     if (!f.open( IO_WriteOnly|IO_Raw ) )
         return false;
 
     int written;
     QString out;
     out = "<!DOCTYPE Tasks>\n<Tasks>\n";
 
     // for all todos
     QMap<int, OTodo>::Iterator it;
     for (it = m_events.begin(); it != m_events.end(); ++it ) {
         out+= "<Task " + toString( (*it) ) + " />\n";
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp
index f51da29..5990841 100644
--- a/libopie2/opiepim/core/otodoaccess.cpp
+++ b/libopie2/opiepim/core/otodoaccess.cpp
@@ -1,37 +1,37 @@
 #include <qdatetime.h>
 
 #include <qpe/alarmserver.h>
 
-#include "otodoaccessxml.h"
+#include "otodoaccesssql.h"
 #include "otodoaccess.h"
 
 
 OTodoAccess::OTodoAccess( OTodoAccessBackend* end )
     : QObject(), OPimAccessTemplate<OTodo>( end ),  m_todoBackEnd( end )
 {
     if (end == 0l )
-        m_todoBackEnd = new OTodoAccessXML( "Todolist" );
+        m_todoBackEnd = new OTodoAccessBackendSQL( QString::null);
 
     setBackEnd( m_todoBackEnd );
 }
 OTodoAccess::~OTodoAccess() {
 //    qWarning("~OTodoAccess");
 }
 void OTodoAccess::mergeWith( const QValueList<OTodo>& list ) {
     QValueList<OTodo>::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         replace( (*it) );
     }
 }
 OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start,
                                                const QDate& end,
                                                bool includeNoDates ) {
     QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates );
 
     List lis( ints, this );
     return lis;
 }
 OTodoAccess::List OTodoAccess::effectiveToDos( const QDate& start,
                                                bool includeNoDates ) {
     return effectiveToDos( start, QDate::currentDate(),
                            includeNoDates );
diff --git a/libopie2/opiepim/orecordlist.h b/libopie2/opiepim/orecordlist.h
index 1fd0741..b6fa7fa 100644
--- a/libopie2/opiepim/orecordlist.h
+++ b/libopie2/opiepim/orecordlist.h
@@ -133,56 +133,55 @@ ORecordListIterator<T>::~ORecordListIterator() {
 
 template <class T>
 ORecordListIterator<T>::ORecordListIterator( const ORecordListIterator<T>& it) {
 //    qWarning("ORecordListIterator copy c'tor");
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
 }
 
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator=( const ORecordListIterator<T>& it) {
     m_uids = it.m_uids;
     m_current = it.m_current;
     m_temp = it.m_temp;
     m_end = it.m_end;
     m_record = it.m_record;
 
     return *this;
 }
 
 template <class T>
 T ORecordListIterator<T>::operator*() {
-//    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
+    qWarning("operator* %d %d", m_current,  m_uids[m_current] );
     if (!m_end )
         /* FIXME
          * until the cache is in place
          * we do the uid match uid check
          */
-        if(m_record.uid() != m_uids[m_current] )
-           m_record = m_temp->find( m_uids[m_current] );
+        m_record = m_temp->find( m_uids[m_current] );
     else
         m_record = T();
 
     return m_record;
 }
 
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator++() {
     if (m_current < m_uids.count() ) {
         m_end = false;
         ++m_current;
     }else
         m_end = true;
 
     return *this;
 }
 template <class T>
 ORecordListIterator<T> &ORecordListIterator<T>::operator--() {
     if ( m_current > 0 ) {
         --m_current;
         m_end = false;
     }  else
         m_end = true;