SQL-Backends are almost finished !

Works: Loading/Storing data, Most important search queries for Address/todo Unfinished: Search-Queries for Datebook, regexp search
author: eilers <eilers> 2004-04-05 07:03:09 (UTC)
committer: eilers <eilers> 2004-04-05 07:03:09 (UTC)
commit: e6e31e93aa55bb967a044fe3660201000a6e59b0 (patch) (unidiff)
tree: 1071fa4b22698fd56dde283bbb7375478b7e1ddf
parent: 6be3d148fc1d610ebfa193012657b3b77d9368e3 (diff)
download: opie-e6e31e93aa55bb967a044fe3660201000a6e59b0.zip
opie-e6e31e93aa55bb967a044fe3660201000a6e59b0.tar.gz
opie-e6e31e93aa55bb967a044fe3660201000a6e59b0.tar.bz2
7 files changed, 339 insertions, 94 deletions
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 1ea35a8..3142f75 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -41,2 +41,3 @@
+#include <opie2/opimcontact.h>
 #include <opie2/opimcontactfields.h>
@@ -48,2 +49,3 @@
+using namespace Opie;
 using namespace Opie::DB;
@@ -52,4 +54,3 @@ using namespace Opie::DB;
 /*
- * Implementation of used query types
+ * Implementation of used query types * CREATE query
- * CREATE query
 * LOAD query
@@ -59,3 +60,3 @@ using namespace Opie::DB;
 */
-namespace Opie {
+namespace {
        /**
@@ -152,3 +153,3 @@ namespace Opie {
-        // We using three tables to store the information:
+        // We using two tables to store the information:
        // 1. addressbook  : It contains General information about the contact (non custom)
@@ -170,3 +171,3 @@ namespace Opie {
                
-                qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR, priority INTEGER, value VARCHAR, PRIMARY KEY /* identifier */ (uid, id) );";
+                qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
@@ -223,25 +224,17 @@ namespace Opie {
                        switch ( id ){
-                        case Qtopia::Birthday:{
+                        case Qtopia::Birthday:
-                                // These entries should stored in a special format
+                        case Qtopia::Anniversary:{
-                                // year-month-day
+                                QDate day;
-                                QDate day = m_contact.birthday();
+                                if ( id == Qtopia::Birthday ){
-                                if ( day.isValid() ){
+                                        day = m_contact.birthday();
-                                        qu += QString(",\"%1-%2-%3\"")
-                                                .arg( day.year() )
-                                                .arg( day.month() )
-                                                .arg( day.day() );
                                } else {
-                                        qu += ",\"\"";
+                                        day = m_contact.anniversary();
                                }
-                        }
-                                break;
-                        case Qtopia::Anniversary:{
                                // These entries should stored in a special format
                                // year-month-day
-                                QDate day = m_contact.anniversary();
                                if ( day.isValid() ){
                                        qu += QString(",\"%1-%2-%3\"")
-                                                .arg( day.year() )
+                                                .arg( QString::number( day.year() ).rightJustify( 4, '0' ) )
-                                                .arg( day.month() )
+                                                .arg( QString::number( day.month() ).rightJustify( 2, '0' ) )
-                                                .arg( day.day() );
+                                                .arg( QString::number( day.day() ).rightJustify( 2, '0' ) );
                                } else {
@@ -251,3 +244,2 @@ namespace Opie {
                                break;
                        default:
@@ -270,3 +262,3 @@ namespace Opie {
                                + ",'" 
-                                + it.key() //.latin1()
+                                + it.key()
                                + "',"
@@ -274,3 +266,3 @@ namespace Opie {
                                + ",'" 
-                                + it.data() //.latin1()
+                                + it.data()
                                + "');";
@@ -278,3 +270,3 @@ namespace Opie {
                // qu  += "commit;";
-                qWarning("add %s", qu.latin1() );
+                qDebug("add %s", qu.latin1() );
                return qu;
@@ -360,3 +352,3 @@ OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* a
 {
-        qWarning("C'tor OPimContactAccessBackend_SQL starts");
+        qDebug("C'tor OPimContactAccessBackend_SQL starts");
        QTime t;
@@ -377,3 +369,3 @@ OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* a
-        qWarning("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
+        qDebug("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
 }
@@ -478,3 +470,3 @@ OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
 {
-        qWarning("OPimContactAccessBackend_SQL::find()");
+        qDebug("OPimContactAccessBackend_SQL::find()");
        QTime t;
@@ -485,3 +477,3 @@ OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
-        qWarning("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
+        qDebug("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
        return retContact;
@@ -491,5 +483,14 @@ OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
-QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& d = QDateTime() )
+QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& qd )
 {
        QString qu = "SELECT uid FROM addressbook WHERE";
+        QString searchQuery ="";
+        QDate startDate;
+        
+        if ( qd.isValid() )
+                startDate = qd.date();
+        else
+                startDate = QDate::currentDate();
+        
@@ -500,9 +501,67 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
        // Convert every filled field to a SQL-Query
-        bool isAnyFieldSelected = false;
+        // bool isAnyFieldSelected = false;
        for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
                int id = translate[*it];
                QString queryStr = queryFields[id];
+                QDate* endDate = 0l;
                if ( !queryStr.isEmpty() ){
-                        isAnyFieldSelected = true;
+                        // If something is alredy stored in the query, add an "AND"
+                        // to the end of the string to prepare for the next ..
+                        if ( !searchQuery.isEmpty() )
+                                searchQuery += " AND";
+        //              isAnyFieldSelected = true;
                        switch( id ){
+                        case Qtopia::Birthday:
+                                endDate = new QDate( query.birthday() ); 
+                                // Fall through !
+                        case Qtopia::Anniversary:
+                                if ( endDate == 0l )
+                                        endDate = new QDate( query.anniversary() );
+                                if ( settings & OPimContactAccess::DateDiff ) {
+                                        searchQuery += QString( " (\"%1\" <= '%2-%3-%4\' AND \"%5\" >= '%6-%7-%8')" )
+                                                .arg( *it )
+                                                .arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) )
+                                                .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) )
+                                                .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) )
+                                                .arg( *it )
+                                                .arg( QString::number( startDate.year() ).rightJustify( 4, '0' ) )
+                                                .arg( QString::number( startDate.month() ).rightJustify( 2, '0' ) ) 
+                                                .arg( QString::number( startDate.day() ).rightJustify( 2, '0' ) ) ;
+                                }
+                                if ( settings & OPimContactAccess::DateYear ){
+                                        if ( settings & OPimContactAccess::DateDiff )
+                                                searchQuery += " AND";
+                                        searchQuery += QString( " (\"%1\" LIKE '%2-%')" )
+                                                .arg( *it )
+                                                .arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) );
+                                }
+                                if ( settings & OPimContactAccess::DateMonth ){
+                                        if ( ( settings & OPimContactAccess::DateDiff ) 
+                                             || ( settings & OPimContactAccess::DateYear ) )
+                                                searchQuery += " AND";
+                                        searchQuery += QString( " (\"%1\" LIKE '%-%2-%')" )
+                                                .arg( *it )
+                                                .arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) );
+                                }
+                                if ( settings & OPimContactAccess::DateDay ){
+                                        if ( ( settings & OPimContactAccess::DateDiff ) 
+                                             || ( settings & OPimContactAccess::DateYear ) 
+                                             || ( settings & OPimContactAccess::DateMonth ) )
+                                                searchQuery += " AND";
+                                        searchQuery += QString( " (\"%1\" LIKE '%-%-%2')" )
+                                                .arg( *it )
+                                                .arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) );
+                                }
+                                break;
                        default:
@@ -512,7 +571,7 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
                                if ( settings & OPimContactAccess::IgnoreCase )
-                                        qu += "(\"" + *it + "\"" + " LIKE " + "'" 
+                                        searchQuery += "(\"" + *it + "\"" + " LIKE " + "'" 
-                                                + queryStr.replace(QRegExp("\\*"),"%") + "'" + ") AND "; 
+                                                + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")"; 
                                else
-                                        qu += "(\"" + *it + "\"" + " GLOB " + "'" 
+                                        searchQuery += "(\"" + *it + "\"" + " GLOB " + "'" 
-                                                + queryStr + "'" + ") AND "; 
+                                                + queryStr + "'" + ")"; 
                                        
@@ -522,6 +581,8 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
        // Skip trailing "AND"
-        if ( isAnyFieldSelected )
+        // if ( isAnyFieldSelected )
-                qu = qu.left( qu.length() - 4 );
+        //      qu = qu.left( qu.length() - 4 );
+        qu += searchQuery;
-        qWarning( "queryByExample query: %s", qu.latin1() );
+        qDebug( "queryByExample query: %s", qu.latin1() );
@@ -549,3 +610,8 @@ const uint OPimContactAccessBackend_SQL::querySettings()
        return OPimContactAccess::IgnoreCase 
-                || OPimContactAccess::WildCards;
+                || OPimContactAccess::WildCards
+                || OPimContactAccess::DateDiff
+                || OPimContactAccess::DateYear
+                || OPimContactAccess::DateMonth
+                || OPimContactAccess::DateDay
+                ;
 }
@@ -563,6 +629,6 @@ bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
                                | OPimContactAccess::WildCards
-        //                      | OPimContactAccess::DateDiff
+                                | OPimContactAccess::DateDiff
-        //                      | OPimContactAccess::DateYear
+                                | OPimContactAccess::DateYear
-        //                      | OPimContactAccess::DateMonth
+                                | OPimContactAccess::DateMonth
-        //                      | OPimContactAccess::DateDay
+                                | OPimContactAccess::DateDay
        //                      | OPimContactAccess::RegExp
@@ -611,3 +677,3 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
-        // qWarning("sorted query is: %s", query.latin1() ); 
+        // qDebug("sorted query is: %s", query.latin1() ); 
@@ -622,3 +688,3 @@ QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
-        qWarning("sorted needed %d ms!", t.elapsed() );
+        qDebug("sorted needed %d ms!", t.elapsed() );
        return list;
@@ -629,3 +695,3 @@ void OPimContactAccessBackend_SQL::update()
 {
-        qWarning("Update starts");
+        qDebug("Update starts");
        QTime t;
@@ -645,3 +711,3 @@ void OPimContactAccessBackend_SQL::update()
-        qWarning("Update ends %d ms", t.elapsed() );
+        qDebug("Update ends %d ms", t.elapsed() );
 }
@@ -650,3 +716,3 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
-        qWarning("extractUids");
+        qDebug("extractUids");
        QTime t;
@@ -656,3 +722,3 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
        QArray<int> ints(list.count() );
-        qWarning(" count = %d", list.count() );
+        qDebug(" count = %d", list.count() );
@@ -663,3 +729,3 @@ QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
        }
-        qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
+        qDebug("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
@@ -698,3 +764,3 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
                
-                // qWarning("Reading %s... found: %s", (*it).latin1(), value.latin1() );
+                // qDebug("Reading %s... found: %s", (*it).latin1(), value.latin1() );
@@ -716,3 +782,3 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
                case Qtopia::AddressCategory:
-                        qWarning("Category is: %s", value.latin1() );
+                        qDebug("Category is: %s", value.latin1() );
                default:
@@ -726,4 +792,4 @@ QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) co
-        // qWarning("Adding UID: %s", resItem.data( "uid" ).latin1() );
+        // qDebug("Adding UID: %s", resItem.data( "uid" ).latin1() );
-        qWarning("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
+        qDebug("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
                 t.elapsed(), t2needed, t3needed  );
@@ -755,3 +821,3 @@ QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) c
-        qWarning("RequestCustom needed: %d ms", t.elapsed() );
+        qDebug("RequestCustom needed: %d ms", t.elapsed() );
        return customMap;
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
index 2b467c3..7b4d81f 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp
@@ -232,2 +232,3 @@ QArray<int> OPimContactAccessBackend_XML::queryByExample ( const OPimContact &qu
                                checkDate = new QDate( (*it)->birthday() );
+                                // fall through
                        case Qtopia::Anniversary:
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
index a779dc1..8a8cb0b 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.cpp
@@ -50,2 +50,39 @@ using namespace Opie::DB;
+namespace {
+        /**
+         * a find query for custom elements
+         */
+        class FindCustomQuery : public OSQLQuery {
+        public:
+                FindCustomQuery(int uid);
+                FindCustomQuery(const QArray<int>& );
+                ~FindCustomQuery();
+                QString query()const;
+        private:
+                QString single()const;
+                QString multi()const;
+                QArray<int> m_uids;
+                int m_uid;
+        };
+        FindCustomQuery::FindCustomQuery(int uid)
+                : OSQLQuery(), m_uid( uid ) {
+        }
+        FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
+                : OSQLQuery(), m_uids( ints ){
+        }
+        FindCustomQuery::~FindCustomQuery() {
+        }
+        QString FindCustomQuery::query()const{
+        //      if ( m_uids.count() == 0 )
+                        return single();
+        }
+        QString FindCustomQuery::single()const{
+                QString qu = "select uid, type, value from custom_data where uid = ";
+                qu += QString::number(m_uid);
+                return qu;
+        }
+}
 namespace Opie {
@@ -125,3 +162,3 @@ bool ODateBookAccessBackend_SQL::load()
                
-        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR, priority INTEGER, value VARCHAR, PRIMARY KEY /* identifier */ (uid, id) );";
+        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
@@ -204,5 +241,5 @@ OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
-        // Last step: Put map into date event and return it
+        // Last step: Put map into date event, add custom map and return it
        OPimEvent retDate( dateEventMap );
+        retDate.setExtraMap( requestCustom( uid ) );
        return retDate;
@@ -367,2 +404,29 @@ QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
+QMap<QString, QString> ODateBookAccessBackend_SQL::requestCustom( int uid ) const
+{
+        QTime t;
+        t.start();
+        QMap<QString, QString> customMap;
+        
+        FindCustomQuery query( uid );
+        OSQLResult res_custom = m_driver->query( &query );
+        if ( res_custom.state() == OSQLResult::Failure ) {
+                qWarning("OSQLResult::Failure in find query !!");
+                QMap<QString, QString> empty;
+                return empty;
+        }
+        OSQLResultItem::ValueList list = res_custom.results();
+        OSQLResultItem::ValueList::Iterator it = list.begin();
+        for ( ; it != list.end(); ++it ) {
+                customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
+        }
+        qDebug("RequestCustom needed: %d ms", t.elapsed() );
+        return customMap;
+}
 }
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
index 60d7f21..b624159 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_sql.h
@@ -90,3 +90,5 @@ private:
    void update();
    QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
+    QMap<QString, QString> requestCustom( int uid ) const;
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index d218090..b4170fc 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -3,2 +3,3 @@
                             Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
+                             Copyright (C) Holger Freyther (zecke@handhelds.org)
              =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
@@ -30,2 +31,4 @@
 #include <qdatetime.h>
+#include <qmap.h>
+#include <qstring.h>
@@ -150,2 +153,20 @@ namespace {
+        /**
+         * a find query for custom elements
+         */
+        class FindCustomQuery : public OSQLQuery {
+        public:
+                FindCustomQuery(int uid);
+                FindCustomQuery(const QArray<int>& );
+                ~FindCustomQuery();
+                QString query()const;
+        private:
+                QString single()const;
+                QString multi()const;
+                QArray<int> m_uids;
+                int m_uid;
+        };
+        
    CreateQuery::CreateQuery() : OSQLQuery() {}
@@ -159,3 +180,3 @@ namespace {
        qu += "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) );";
+        qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
        return qu;
@@ -181,3 +202,5 @@ namespace {
     * converts from a OPimTodo to a query
-     * we leave out X-Ref + Alarms
+     * we leave out X-Ref + Maintainer
+     * FIXME: Implement/Finish toMap()/fromMap() into OpimTodo to move the encoding
+     *        decoding stuff there.. (eilers)
     */
@@ -217,5 +240,5 @@ namespace {
                +       QString::number(m_todo.priority() )             + ","
-                + "'" + QString::number(year) + "-" 
+                + "'" + QString::number(year).rightJustify( 4, '0' ) + "-" 
-                +       QString::number(month)
+                +       QString::number(month).rightJustify( 2, '0' )
-                +       "-" + QString::number( day )              + "'" + ","
+                +       "-" + QString::number( day ).rightJustify( 2, '0' )+ "'" + ","
                +       QString::number( m_todo.progress() )            + ","
@@ -242,11 +265,31 @@ namespace {
        qu +=   QString( "''" )                             + QString( "," ) // Maintainers (cur. not supported !)
-                + "'" + QString::number(sYear) + "-" 
+                + "'" + QString::number(sYear).rightJustify( 4, '0' ) + "-" 
-                + QString::number(sMonth)
+                + QString::number(sMonth).rightJustify( 2, '0' )
-                + "-" + QString::number(sDay)                     + "'" + ","
+                + "-" + QString::number(sDay).rightJustify( 2, '0' )+ "'" + ","
-                + "'" + QString::number(eYear) + "-"
+                + "'" + QString::number(eYear).rightJustify( 4, '0' ) + "-"
-                +       QString::number(eMonth)
+                +       QString::number(eMonth).rightJustify( 2, '0' )
-                +       "-"+QString::number(eDay)                 + "'"
+                +       "-"+QString::number(eDay).rightJustify( 2, '0' ) + "'"
                + ")";
-        qWarning("add %s", qu.latin1() );
+        // Save custom Entries:
+        int id = 0;
+        id = 0;
+        QMap<QString, QString> customMap = m_todo.toExtraMap();
+        for( QMap<QString, QString>::Iterator it = customMap.begin(); 
+             it != customMap.end(); ++it ){
+                qu  += "insert into custom_data VALUES(" 
+                        +  QString::number( m_todo.uid() )
+                        + ","
+                        +  QString::number( id++ ) 
+                        + ",'" 
+                        + it.key()
+                        + "',"
+                        + "0" // Priority for future enhancements
+                        + ",'" 
+                        + it.data()
+                        + "');";
+                }       
+        
+        qDebug("add %s", qu.latin1() );
        return qu;
@@ -302,3 +345,6 @@ namespace {
        QString str;
-        str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() );
+        str = QString("select uid from todolist where DueDate ='%1-%2-%3'")
+                .arg( QString::number( date.year() ).rightJustify( 4, '0' ) )
+                .arg( QString::number( date.month() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( date.day() ) .rightJustify( 2, '0' ) );
@@ -317,4 +363,8 @@ namespace {
        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( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
-            .arg( m_end  .year() ).arg( m_end  .month() ).arg( m_end  .day() );
+                .arg( QString::number( m_start.month() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( m_start.day() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( m_end.year() ).rightJustify( 4, '0' ) )
+                .arg( QString::number( m_end.month() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( m_end.day() ).rightJustify( 2, '0' ) );
        return str;
@@ -324,4 +374,8 @@ namespace {
        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( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
-            .arg(m_end.  year() ).arg(m_end.  month() ).arg(m_end.day() );
+                .arg( QString::number( m_start.month() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( m_start.day() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( m_end.year() ).rightJustify( 4, '0' ) )
+                .arg( QString::number( m_end.month() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( m_end.day() ).rightJustify( 2, '0' ) );
@@ -329,2 +383,20 @@ namespace {
    }
+        FindCustomQuery::FindCustomQuery(int uid)
+                : OSQLQuery(), m_uid( uid ) {
+        }
+        FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
+                : OSQLQuery(), m_uids( ints ){
+        }
+        FindCustomQuery::~FindCustomQuery() {
+        }
+        QString FindCustomQuery::query()const{
+                return single(); // Multiple requests not supported !
+        }
+        QString FindCustomQuery::single()const{
+                QString qu = "select uid, type, value from custom_data where uid = ";
+                qu += QString::number(m_uid);
+                return qu;
+        }
 };
@@ -334,3 +406,3 @@ namespace Opie {
 OPimTodoAccessBackendSQL::OPimTodoAccessBackendSQL( const QString& file )
-    : OPimTodoAccessBackend(), m_dict(15), m_driver(NULL), m_dirty(true)
+        : OPimTodoAccessBackend(),/* m_dict(15),*/ m_driver(NULL), m_dirty(true)
 {
@@ -385,3 +457,3 @@ OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
    uint CACHE = readAhead();
-    qWarning("searching for %d", uid );
+    qDebug("searching for %d", uid );
    QArray<int> search( CACHE );
@@ -395,3 +467,3 @@ OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
        for (uint i = cur; i < ints.count() && size < CACHE; i++ ) {
-            qWarning("size %d %d", size,  ints[i] );
+            qDebug("size %d %d", size,  ints[i] );
            search[size] = ints[i];
@@ -470,3 +542,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
                                           int sortFilter, int cat ) {
-    qWarning("sorted %d, %d", asc, sortOrder );
+    qDebug("sorted %d, %d", asc, sortOrder );
    QString query;
@@ -491,3 +563,6 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
        QString base;
-        base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() );
+        base = QString("DueDate <= '%1-%2-%3' AND completed = 0")
+                .arg( QString::number( date.year() ).rightJustify( 4, '0' ) )
+                .arg( QString::number( date.month() ).rightJustify( 2, '0' ) )
+                .arg( QString::number( date.day() ).rightJustify( 2, '0' ) );
        query += " " + base + " AND";
@@ -500,3 +575,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
    }
-    /* srtip the end */
+    /* strip the end */
    query = query.remove( query.length()-3, 3 );
@@ -526,3 +601,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
    if ( !asc ) {
-        qWarning("not ascending!");
+        qDebug("not ascending!");
        query += " DESC";
@@ -530,3 +605,3 @@ QArray<int> OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
-    qWarning( query );
+    qDebug( query );
    OSQLRawQuery raw(query );
@@ -547,3 +622,3 @@ bool OPimTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
 }
-OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res) const{
+OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{
    if ( res.state() == OSQLResult::Failure ) {
@@ -555,3 +630,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res) const{
    OSQLResultItem::ValueList::Iterator it = list.begin();
-    qWarning("todo1");
+    qDebug("todo1");
    OPimTodo to = todo( (*it) );
@@ -561,3 +636,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res) const{
    for ( ; it != list.end(); ++it ) {
-        qWarning("caching");
+        qDebug("caching");
        cache( todo( (*it) ) );
@@ -567,3 +642,6 @@ OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res) const{
 OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
-    qWarning("todo");
+    qDebug("todo(ResultItem)");
+    // Request information from addressbook table and create the OPimTodo-object.
+    
    bool hasDueDate = false; QDate dueDate = QDate::currentDate();
@@ -572,3 +650,3 @@ OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
-    qWarning("Item is completed: %d", item.data("completed").toInt() );
+    qDebug("Item is completed: %d", item.data("completed").toInt() );
@@ -616,2 +694,5 @@ OPimTodo OPimTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
+    // Finally load the custom-entries for this UID and put it into the created object
+    to.setExtraMap( requestCustom( to.uid() ) );
    return to;
@@ -626,2 +707,4 @@ OPimTodo OPimTodoAccessBackendSQL::todo( int uid )const {
 void OPimTodoAccessBackendSQL::fillDict() {
+#if 0
    /* initialize dict */
@@ -647,2 +730,4 @@ void OPimTodoAccessBackendSQL::fillDict() {
 //    m_dict.insert("AlarmDateTime",   new int(OPimTodo::AlarmDateTime)    ); // old stuff (eilers)
+#endif
 }
@@ -666,3 +751,3 @@ QArray<int> OPimTodoAccessBackendSQL::uids( const OSQLResult& res) const{
    QArray<int> ints(list.count() );
-    qWarning(" count = %d", list.count() );
+    qDebug(" count = %d", list.count() );
@@ -727,2 +812,28 @@ void OPimTodoAccessBackendSQL::removeAllCompleted(){
+QMap<QString, QString>  OPimTodoAccessBackendSQL::requestCustom( int uid ) const
+{
+        QMap<QString, QString> customMap;
+        
+        FindCustomQuery query( uid );
+        OSQLResult res_custom = m_driver->query( &query );
+        if ( res_custom.state() == OSQLResult::Failure ) {
+                qWarning("OSQLResult::Failure in find query !!");
+                QMap<QString, QString> empty;
+                return empty;
+        }
+        OSQLResultItem::ValueList list = res_custom.results();
+        OSQLResultItem::ValueList::Iterator it = list.begin();
+        for ( ; it != list.end(); ++it ) {
+                customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
+        }
+        return customMap;
+}
 }
diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h
index 0ae2591..0cc7722 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.h
+++ b/libopie2/opiepim/backend/otodoaccesssql.h
@@ -31,3 +31,3 @@
-#include <qasciidict.h>
+/* #include <qasciidict.h> */
@@ -82,4 +82,5 @@ private:
    QBitArray sup() const;
+    QMap<QString, QString>  requestCustom( int uid ) const;
-    QAsciiDict<int> m_dict;
+    // QAsciiDict<int> m_dict;
    Opie::DB::OSQLDriver* m_driver;
diff --git a/libopie2/opiepim/core/opimcontact.h b/libopie2/opiepim/core/opimcontact.h
index c08f7ed..9d3cacc 100644
--- a/libopie2/opiepim/core/opimcontact.h
+++ b/libopie2/opiepim/core/opimcontact.h
@@ -2,3 +2,3 @@
                             This file is part of the Opie Project
-                             Copyright (C) The Main Author <main-author@whereever.org>
+                             Copyright (C) Stefan Eilers <eilers.stefan@handhelds.org>
              =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
author	eilers <eilers>	2004-04-05 07:03:09 (UTC)
committer	eilers <eilers>	2004-04-05 07:03:09 (UTC)
commit	e6e31e93aa55bb967a044fe3660201000a6e59b0 (patch) (unidiff)
tree	1071fa4b22698fd56dde283bbb7375478b7e1ddf
parent	6be3d148fc1d610ebfa193012657b3b77d9368e3 (diff)
download	opie-e6e31e93aa55bb967a044fe3660201000a6e59b0.zip opie-e6e31e93aa55bb967a044fe3660201000a6e59b0.tar.gz opie-e6e31e93aa55bb967a044fe3660201000a6e59b0.tar.bz2