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
@@ -1,760 +1,826 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * SQL Backend for the OPIE-Contact Database.
  */
 
 #include "ocontactaccessbackend_sql.h"
 
 #include <qarray.h>
 #include <qdatetime.h>
 #include <qstringlist.h>
 
 #include <qpe/global.h>
 #include <qpe/recordfields.h>
 
+#include <opie2/opimcontact.h>
 #include <opie2/opimcontactfields.h>
 #include <opie2/opimdateconversion.h>
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
+using namespace Opie;
 using namespace Opie::DB;
 
 
 /*
- * Implementation of used query types
- * CREATE query
+ * Implementation of used query types * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
-namespace Opie {
+namespace {
         /**
          * CreateQuery for the Todolist Table
          */
         class CreateQuery : public OSQLQuery {
         public:
                 CreateQuery();
                 ~CreateQuery();
                 QString query()const;
         };
         
         /**
          * Clears (delete) a Table
          */
         class ClearQuery : public OSQLQuery {
         public:
                 ClearQuery();
                 ~ClearQuery();
                 QString query()const;
                 
         };
         
 
         /**
          * LoadQuery
          * this one queries for all uids
          */
         class LoadQuery : public OSQLQuery {
         public:
                 LoadQuery();
                 ~LoadQuery();
                 QString query()const;
         };
         
         /**
          * inserts/adds a OPimContact to the table
          */
         class InsertQuery : public OSQLQuery {
         public:
                 InsertQuery(const OPimContact& );
                 ~InsertQuery();
                 QString query()const;
         private:
                 OPimContact m_contact;
         };
         
 
         /**
          * removes one from the table
          */
         class RemoveQuery : public OSQLQuery {
         public:
                 RemoveQuery(int uid );
                 ~RemoveQuery();
                 QString query()const;
         private:
                 int m_uid;
         };
         
         /**
          * a find query for noncustom elements
          */
         class FindQuery : public OSQLQuery {
         public:
                 FindQuery(int uid);
                 FindQuery(const QArray<int>& );
                 ~FindQuery();
                 QString query()const;
         private:
                 QString single()const;
                 QString multi()const;
                 QArray<int> m_uids;
                 int m_uid;
         };
 
         /**
          * 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;
         };
         
 
 
-        // 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)
         // 2. custom_data  : Not official supported entries
         // All tables are connected by the uid of the contact.
         // Maybe I should add a table for meta-information ? 
         CreateQuery::CreateQuery() : OSQLQuery() {}
         CreateQuery::~CreateQuery() {}
         QString CreateQuery::query()const {
                 QString qu;
 
                 qu += "create table addressbook( uid PRIMARY KEY ";
 
                 QStringList fieldList = OPimContactFields::untrfields( false );
                 for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
                         qu += QString( ",\"%1\" VARCHAR(10)" ).arg( *it );
                 }
                 qu += " );";
                 
-                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) );";
 
                 return qu;
         }
         
         ClearQuery::ClearQuery()
                 : OSQLQuery() {}
         ClearQuery::~ClearQuery() {}
         QString ClearQuery::query()const {
                 QString qu = "drop table addressbook;";
                 qu += "drop table custom_data;";
         //      qu += "drop table dates;";
                 return qu;
         }
 
 
         LoadQuery::LoadQuery() : OSQLQuery() {}
         LoadQuery::~LoadQuery() {}
         QString LoadQuery::query()const {
                 QString qu;
                 qu += "select uid from addressbook";
                 
                 return qu;
         }
         
 
         InsertQuery::InsertQuery( const OPimContact& contact )
                 : OSQLQuery(), m_contact( contact ) {
         }
 
         InsertQuery::~InsertQuery() {
         }
 
         /*
          * converts from a OPimContact to a query
          */
         QString InsertQuery::query()const{
 
                 QString qu;
                 qu  += "insert into addressbook VALUES( " + 
                         QString::number( m_contact.uid() );
 
                 // Get all information out of the contact-class
                 // Remember: The category is stored in contactMap, too ! 
                 QMap<int, QString> contactMap = m_contact.toMap();
                 
                 QStringList fieldList = OPimContactFields::untrfields( false );
                 QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
                 for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
                         // Convert Column-String to Id and get value for this id..
                         // Hmmm.. Maybe not very cute solution..
                         int id = translate[*it];
                         switch ( id ){
-                        case Qtopia::Birthday:{
-                                // These entries should stored in a special format
-                                // year-month-day
-                                QDate day = m_contact.birthday();
-                                if ( day.isValid() ){
-                                        qu += QString(",\"%1-%2-%3\"")
-                                                .arg( day.year() )
-                                                .arg( day.month() )
-                                                .arg( day.day() );
+                        case Qtopia::Birthday:
+                        case Qtopia::Anniversary:{
+                                QDate day;
+                                if ( id == Qtopia::Birthday ){
+                                        day = m_contact.birthday();
                                 } 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( day.month() )
-                                                .arg( day.day() );
+                                                .arg( QString::number( day.year() ).rightJustify( 4, '0' ) )
+                                                .arg( QString::number( day.month() ).rightJustify( 2, '0' ) )
+                                                .arg( QString::number( day.day() ).rightJustify( 2, '0' ) );
                                 } else {
                                         qu += ",\"\"";
                                 }
                         }
                                 break;
-
                         default:
                                 qu += QString( ",\"%1\"" ).arg( contactMap[id] );
                         }
                 }
                 qu += " );";
 
                         
                 // Now add custom data..
                 int id = 0;
                 id = 0;
                 QMap<QString, QString> customMap = m_contact.toExtraMap();
                 for( QMap<QString, QString>::Iterator it = customMap.begin(); 
                      it != customMap.end(); ++it ){
                         qu  += "insert into custom_data VALUES(" 
                                 +  QString::number( m_contact.uid() )
                                 + ","
                                 +  QString::number( id++ ) 
                                 + ",'" 
-                                + it.key() //.latin1()
+                                + it.key()
                                 + "',"
                                 + "0" // Priority for future enhancements
                                 + ",'" 
-                                + it.data() //.latin1()
+                                + it.data()
                                 + "');";
                         }       
                 // qu  += "commit;";
-                qWarning("add %s", qu.latin1() );
+                qDebug("add %s", qu.latin1() );
                 return qu;
         }
         
 
         RemoveQuery::RemoveQuery(int uid )
                 : OSQLQuery(), m_uid( uid ) {}
         RemoveQuery::~RemoveQuery() {}
         QString RemoveQuery::query()const {
                 QString qu = "DELETE from addressbook where uid = " 
                         + QString::number(m_uid) + ";";
                 qu += "DELETE from custom_data where uid = " 
                         + QString::number(m_uid) + ";";
                 return qu;
         }
         
 
         
 
         FindQuery::FindQuery(int uid)
                 : OSQLQuery(), m_uid( uid ) {
         }
         FindQuery::FindQuery(const QArray<int>& ints)
                 : OSQLQuery(), m_uids( ints ){
         }
         FindQuery::~FindQuery() {
         }
         QString FindQuery::query()const{
         //      if ( m_uids.count() == 0 )
                 return single();
         }
         /*
           else
                         return multi();
                         }
         QString FindQuery::multi()const {
                 QString qu = "select uid, type, value from addressbook where";
                 for (uint i = 0; i < m_uids.count(); i++ ) {
                         qu += " UID = " + QString::number( m_uids[i] ) + " OR";
                 }
                 qu.remove( qu.length()-2, 2 ); // Hmmmm.. 
                 return qu;
         }
         */
         QString FindQuery::single()const{
                 QString qu = "select *";
                 qu += " from addressbook where uid = " + QString::number(m_uid);
 
                 // qWarning("find query: %s", qu.latin1() );
                 return qu;
         }
 
 
         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 {
 
 OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* appname */, 
                                                        const QString& filename ): 
         OPimContactAccessBackend(), m_changed(false), m_driver( NULL )
 {
-        qWarning("C'tor OPimContactAccessBackend_SQL starts");
+        qDebug("C'tor OPimContactAccessBackend_SQL starts");
         QTime t;
         t.start();
 
         /* Expecting to access the default filename if nothing else is set */
         if ( filename.isEmpty() ){
                 m_fileName = Global::applicationFileName( "addressbook","addressbook.db" );
         } else
                 m_fileName = filename;
 
         // Get the standart sql-driver from the OSQLManager..
         OSQLManager man;
         m_driver = man.standard();
                 m_driver->setUrl( m_fileName );
 
         load();
 
-        qWarning("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
+        qDebug("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
 }
 
 OPimContactAccessBackend_SQL::~OPimContactAccessBackend_SQL ()
 {
         if( m_driver )
                 delete m_driver;
 }
 
 bool OPimContactAccessBackend_SQL::load ()
 {
         if (!m_driver->open() )
                 return false;
 
         // Don't expect that the database exists.
         // It is save here to create the table, even if it
         // do exist. ( Is that correct for all databases ?? )
         CreateQuery creat;
         OSQLResult res = m_driver->query( &creat );
 
         update();
 
         return true;
 
 }
 
 bool OPimContactAccessBackend_SQL::reload()
 {
         return load();
 }
 
 bool OPimContactAccessBackend_SQL::save()
 {
         return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 
 
 void OPimContactAccessBackend_SQL::clear ()
 {
         ClearQuery cle;
         OSQLResult res = m_driver->query( &cle );
 
         reload();
 }
 
 bool OPimContactAccessBackend_SQL::wasChangedExternally()
 {
         return false;
 }
 
 QArray<int> OPimContactAccessBackend_SQL::allRecords() const
 {
 
         // FIXME: Think about cute handling of changed tables..
         // Thus, we don't have to call update here...
          if ( m_changed )  
                 ((OPimContactAccessBackend_SQL*)this)->update();
         
         return m_uids;
 }
 
 bool OPimContactAccessBackend_SQL::add ( const OPimContact &newcontact )
 {
         InsertQuery ins( newcontact );
         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] = newcontact.uid();
         
         return true;
 }
 
 
 bool OPimContactAccessBackend_SQL::remove ( int uid )
 {
         RemoveQuery rem( uid );
         OSQLResult res = m_driver->query(&rem );
 
         if ( res.state() == OSQLResult::Failure )
                 return false;
 
         m_changed = true;
 
         return true;
 }
 
 bool OPimContactAccessBackend_SQL::replace ( const OPimContact &contact )
 {
         if ( !remove( contact.uid() ) )
                 return false;
         
         return add( contact );
 }
 
 
 OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
 {
-        qWarning("OPimContactAccessBackend_SQL::find()");
+        qDebug("OPimContactAccessBackend_SQL::find()");
         QTime t;
         t.start();
 
         OPimContact retContact( requestNonCustom( uid ) );
         retContact.setExtraMap( requestCustom( uid ) );
 
-        qWarning("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
+        qDebug("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
         return retContact;
 }
 
 
 
-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();
+        
 
         QMap<int, QString> queryFields = query.toMap();
         QStringList fieldList = OPimContactFields::untrfields( false );
         QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
 
         // 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:
                                 // Switching between case sensitive and insensitive...
                                 // LIKE is not case sensitive, GLOB is case sensitive
                                 // Do exist a better solution to switch this ?
                                 if ( settings & OPimContactAccess::IgnoreCase )
-                                        qu += "(\"" + *it + "\"" + " LIKE " + "'" 
-                                                + queryStr.replace(QRegExp("\\*"),"%") + "'" + ") AND "; 
+                                        searchQuery += "(\"" + *it + "\"" + " LIKE " + "'" 
+                                                + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")"; 
                                 else
-                                        qu += "(\"" + *it + "\"" + " GLOB " + "'" 
-                                                + queryStr + "'" + ") AND "; 
+                                        searchQuery += "(\"" + *it + "\"" + " GLOB " + "'" 
+                                                + queryStr + "'" + ")"; 
                                         
                         }
                 }
         }
         // Skip trailing "AND"
-        if ( isAnyFieldSelected )
-                qu = qu.left( qu.length() - 4 );
+        // if ( isAnyFieldSelected )
+        //      qu = qu.left( qu.length() - 4 );
+
+        qu += searchQuery;
 
-        qWarning( "queryByExample query: %s", qu.latin1() );
+        qDebug( "queryByExample query: %s", qu.latin1() );
 
         // Execute query and return the received uid's
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 QArray<int> empty;
                 return empty;
         }
 
         QArray<int> list = extractUids( res );
 
                 return list;    
 }
 
 QArray<int> OPimContactAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
 {
         QArray<int> nix(0);
         return nix;
 }
 
 const uint OPimContactAccessBackend_SQL::querySettings()
 {
         return OPimContactAccess::IgnoreCase 
-                || OPimContactAccess::WildCards;
+                || OPimContactAccess::WildCards
+                || OPimContactAccess::DateDiff
+                || OPimContactAccess::DateYear
+                || OPimContactAccess::DateMonth
+                || OPimContactAccess::DateDay
+                ;
 }
 
 bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
 {
         /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
          * may be added with any of the other settings. IgnoreCase should never used alone.
          * Wildcards, RegExp, ExactMatch should never used at the same time...
          */
 
         // Step 1: Check whether the given settings are supported by this backend
         if ( ( querySettings & ( 
                                 OPimContactAccess::IgnoreCase
                                 | OPimContactAccess::WildCards
-        //                      | OPimContactAccess::DateDiff
-        //                      | OPimContactAccess::DateYear
-        //                      | OPimContactAccess::DateMonth
-        //                      | OPimContactAccess::DateDay
+                                | OPimContactAccess::DateDiff
+                                | OPimContactAccess::DateYear
+                                | OPimContactAccess::DateMonth
+                                | OPimContactAccess::DateDay
         //                      | OPimContactAccess::RegExp
         //                      | OPimContactAccess::ExactMatch
                                ) ) != querySettings )
                 return false;
 
         // Step 2: Check whether the given combinations are ok..
 
         // IngoreCase alone is invalid
         if ( querySettings == OPimContactAccess::IgnoreCase )
                 return false;
 
         // WildCards, RegExp and ExactMatch should never used at the same time 
         switch ( querySettings & ~( OPimContactAccess::IgnoreCase
                                     | OPimContactAccess::DateDiff
                                     | OPimContactAccess::DateYear
                                     | OPimContactAccess::DateMonth
                                     | OPimContactAccess::DateDay
                                     )
                  ){
         case OPimContactAccess::RegExp:
                 return ( true );
         case OPimContactAccess::WildCards:
                 return ( true );
         case OPimContactAccess::ExactMatch:
                 return ( true );
         case 0: // one of the upper removed bits were set..
                 return ( true );
         default:
                 return ( false );
         }
 
 }
 
 QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
 {
         QTime t;
         t.start();
 
         QString query = "SELECT uid FROM addressbook ";
         query += "ORDER BY \"Last Name\" ";
 
         if ( !asc )
                 query += "DESC";
 
-        // qWarning("sorted query is: %s", query.latin1() ); 
+        // qDebug("sorted query is: %s", query.latin1() ); 
 
         OSQLRawQuery raw( query );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 QArray<int> empty;
                 return empty;
         }
 
         QArray<int> list = extractUids( res );
 
-        qWarning("sorted needed %d ms!", t.elapsed() );
+        qDebug("sorted needed %d ms!", t.elapsed() );
         return list;
 }
 
 
 void OPimContactAccessBackend_SQL::update()
 {
-        qWarning("Update starts");
+        qDebug("Update starts");
         QTime t;
         t.start();
 
         // Now load the database set and extract the uid's
         // which will be held locally
 
         LoadQuery lo;
         OSQLResult res = m_driver->query(&lo);
         if ( res.state() != OSQLResult::Success )
                 return;
 
         m_uids = extractUids( res );
 
         m_changed = false;
 
-        qWarning("Update ends %d ms", t.elapsed() );
+        qDebug("Update ends %d ms", t.elapsed() );
 }
 
 QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
-        qWarning("extractUids");
+        qDebug("extractUids");
         QTime t;
         t.start();
         OSQLResultItem::ValueList list = res.results();
         OSQLResultItem::ValueList::Iterator it;
         QArray<int> ints(list.count() );
-        qWarning(" count = %d", list.count() );
+        qDebug(" count = %d", list.count() );
 
         int i = 0;
         for (it = list.begin(); it != list.end(); ++it ) {
                 ints[i] =  (*it).data("uid").toInt();
                 i++;
         }
-        qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
+        qDebug("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
 
         return ints;
 
 }
 
 QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const
 {
         QTime t;
         t.start();
 
         QMap<int, QString> nonCustomMap;
         
         int t2needed = 0;
         int t3needed = 0;
         QTime t2;
         t2.start();
         FindQuery query( uid );
         OSQLResult res_noncustom = m_driver->query( &query );
         t2needed = t2.elapsed();
 
         OSQLResultItem resItem = res_noncustom.first();
 
         QTime t3;
         t3.start();
         // Now loop through all columns
         QStringList fieldList = OPimContactFields::untrfields( false );
         QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
         for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
                 // Get data for the selected column and store it with the
                 // corresponding id into the map..
 
                 int id =  translate[*it];
                 QString value = resItem.data( (*it) );
                 
-                // qWarning("Reading %s... found: %s", (*it).latin1(), value.latin1() );
+                // qDebug("Reading %s... found: %s", (*it).latin1(), value.latin1() );
 
                 switch( id ){
                 case Qtopia::Birthday:
                 case Qtopia::Anniversary:{
                         // Birthday and Anniversary are encoded special ( yyyy-mm-dd )
                         QStringList list = QStringList::split( '-', value );
                         QStringList::Iterator lit = list.begin();
                         int year  = (*lit).toInt();
                         int month = (*(++lit)).toInt();
                         int day   = (*(++lit)).toInt();
                         if ( ( day != 0 ) && ( month != 0 ) && ( year != 0 ) ){
                              QDate date( year, month, day );
                              nonCustomMap.insert( id, OPimDateConversion::dateToString( date ) );
                         }
                 }
                         break;
                 case Qtopia::AddressCategory:
-                        qWarning("Category is: %s", value.latin1() );
+                        qDebug("Category is: %s", value.latin1() );
                 default:
                         nonCustomMap.insert( id, value );
                 }
         }
 
         // First insert uid
         nonCustomMap.insert( Qtopia::AddressUid, resItem.data( "uid" ) ); 
         t3needed = t3.elapsed();
 
-        // qWarning("Adding UID: %s", resItem.data( "uid" ).latin1() );
-        qWarning("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
+        // qDebug("Adding UID: %s", resItem.data( "uid" ).latin1() );
+        qDebug("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
                  t.elapsed(), t2needed, t3needed  );
 
         return nonCustomMap;
 }
 
 QMap<QString, QString>  OPimContactAccessBackend_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" ) );
         }
 
-        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
@@ -169,128 +169,129 @@ void OPimContactAccessBackend_XML::clear ()
 {
         m_contactList.clear();
         m_uidToContact.clear();
 
         m_changed = false;
 }
 
 bool OPimContactAccessBackend_XML::wasChangedExternally()
 {
         QFileInfo fi( m_fileName );
 
         QDateTime lastmod = fi.lastModified ();
 
         return (lastmod != m_readtime);
 }
 
 QArray<int> OPimContactAccessBackend_XML::allRecords() const
 {
         QArray<int> uid_list( m_contactList.count() );
 
         uint counter = 0;
         QListIterator<OPimContact> it( m_contactList );
         for( ; it.current(); ++it ){
                 uid_list[counter++] = (*it)->uid();
         }
 
         return ( uid_list );
 }
 
 OPimContact OPimContactAccessBackend_XML::find ( int uid ) const
 {
         OPimContact foundContact; //Create empty contact
 
         OPimContact* found = m_uidToContact.find( QString().setNum( uid ) );
 
         if ( found ){
                 foundContact = *found;
         }
 
         return ( foundContact );
 }
 
 QArray<int> OPimContactAccessBackend_XML::queryByExample ( const OPimContact &query, int settings,
                                                         const QDateTime& d )
 {
 
         QArray<int> m_currentQuery( m_contactList.count() );
         QListIterator<OPimContact> it( m_contactList );
         uint arraycounter = 0;
 
         for( ; it.current(); ++it ){
                 /* Search all fields and compare them with query object. Store them into list
                  * if all fields matches.
                  */
                 QDate* queryDate = 0l;
                 QDate* checkDate = 0l;
                 bool allcorrect = true;
                 for ( int i = 0; i < Qtopia::Groups; i++ ) {
                         // Birthday and anniversary are special nonstring fields and should
                         // be handled specially
                         switch ( i ){
                         case Qtopia::Birthday:
                                 queryDate = new QDate( query.birthday() );
                                 checkDate = new QDate( (*it)->birthday() );
+                                // fall through
                         case Qtopia::Anniversary:
                                 if ( queryDate == 0l ){
                                         queryDate = new QDate( query.anniversary() );
                                         checkDate = new QDate( (*it)->anniversary() );
                                 }
 
                                 if ( queryDate->isValid() ){
                                         if(  checkDate->isValid() ){
                                                 if ( settings & OPimContactAccess::DateYear ){
                                                         if ( queryDate->year() != checkDate->year() )
                                                                 allcorrect = false;
                                                 }
                                                 if ( settings & OPimContactAccess::DateMonth ){
                                                         if ( queryDate->month() != checkDate->month() )
                                                                 allcorrect = false;
                                                 }
                                                 if ( settings & OPimContactAccess::DateDay ){
                                                         if ( queryDate->day() != checkDate->day() )
                                                                 allcorrect = false;
                                                 }
                                                 if ( settings & OPimContactAccess::DateDiff ) {
                                                         QDate current;
                                                         // If we get an additional date, we
                                                         // will take this date instead of
                                                         // the current one..
                                                         if ( !d.date().isValid() )
                                                                 current = QDate::currentDate();
                                                         else
                                                                 current = d.date();
 
                                                         // We have to equalize the year, otherwise
                                                         // the search will fail..
                                                         checkDate->setYMD( current.year(),
                                                                            checkDate->month(),
                                                                            checkDate->day() );
                                                         if ( *checkDate < current )
                                                                 checkDate->setYMD( current.year()+1,
                                                                                    checkDate->month(),
                                                                                    checkDate->day() );
 
                                                         // Check whether the birthday/anniversary date is between
                                                         // the current/given date and the maximum date
                                                         // ( maximum time range ) !
                                                         qWarning("Checking if %s is between %s and %s ! ",
                                                                  checkDate->toString().latin1(),
                                                                  current.toString().latin1(),
                                                                  queryDate->toString().latin1() );
                                                         if ( current.daysTo( *queryDate ) >= 0 ){
                                                                 if ( !( ( *checkDate >= current ) &&
                                                                         ( *checkDate <= *queryDate ) ) ){
                                                                         allcorrect = false;
                                                                         qWarning (" Nope!..");
                                                                 }
                                                         }
                                                 }
                                         } else{
                                                 // checkDate is invalid. Therefore this entry is always rejected
                                                 allcorrect = false;
                                         }
                                 }
 
                                 delete queryDate;
                                 queryDate = 0l;
                                 delete checkDate;
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
@@ -1,271 +1,308 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * SQL Backend for the OPIE-Calender Database.
  *
  */
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <qarray.h>
 #include <qstringlist.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include <opie2/opimrecurrence.h>
 #include <opie2/odatebookaccessbackend_sql.h>
 
 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 {
 
 
 ODateBookAccessBackend_SQL::ODateBookAccessBackend_SQL( const QString& ,
                                                         const QString& fileName )
         : ODateBookAccessBackend(), m_driver( NULL ) 
 {
         m_fileName = fileName.isEmpty() ? Global::applicationFileName( "datebook", "datebook.db" ) : fileName;
 
     // Get the standart sql-driver from the OSQLManager..
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl( m_fileName );
 
     initFields();
 
     load();
 }
 
 ODateBookAccessBackend_SQL::~ODateBookAccessBackend_SQL() {
         if( m_driver )
                 delete m_driver;
 }
 
 void ODateBookAccessBackend_SQL::initFields()
 {
 
         // This map contains the translation of the fieldtype id's to 
         // the names of the table columns
         m_fieldMap.insert( OPimEvent::FUid, "uid" );
         m_fieldMap.insert( OPimEvent::FCategories, "Categories" );
         m_fieldMap.insert( OPimEvent::FDescription, "Description" );
         m_fieldMap.insert( OPimEvent::FLocation, "Location" );
         m_fieldMap.insert( OPimEvent::FType, "Type" );
         m_fieldMap.insert( OPimEvent::FAlarm, "Alarm" );
         m_fieldMap.insert( OPimEvent::FSound, "Sound" );
         m_fieldMap.insert( OPimEvent::FRType, "RType" );
         m_fieldMap.insert( OPimEvent::FRWeekdays, "RWeekdays" );
         m_fieldMap.insert( OPimEvent::FRPosition, "RPosition" );
         m_fieldMap.insert( OPimEvent::FRFreq, "RFreq" );
         m_fieldMap.insert( OPimEvent::FRHasEndDate, "RHasEndDate" );
         m_fieldMap.insert( OPimEvent::FREndDate, "REndDate" );
         m_fieldMap.insert( OPimEvent::FRCreated, "RCreated" );
         m_fieldMap.insert( OPimEvent::FRExceptions, "RExceptions" );
         m_fieldMap.insert( OPimEvent::FStart, "Start" );
         m_fieldMap.insert( OPimEvent::FEnd, "End" );
         m_fieldMap.insert( OPimEvent::FNote, "Note" );
         m_fieldMap.insert( OPimEvent::FTimeZone, "TimeZone" );
         m_fieldMap.insert( OPimEvent::FRecParent, "RecParent" );
         m_fieldMap.insert( OPimEvent::FRecChildren, "Recchildren" );
 
         // Create a map that maps the column name to the id
         QMapConstIterator<int, QString> it;
         for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
                 m_reverseFieldMap.insert( it.data(), it.key() );
         }
         
 }
 
 bool ODateBookAccessBackend_SQL::load() 
 {
         if (!m_driver->open() )
                 return false;
 
         // Don't expect that the database exists.
         // It is save here to create the table, even if it
         // do exist. ( Is that correct for all databases ?? )
                 QStringqu = "create table datebook( uid INTEGER PRIMARY KEY ";
         
         QMap<int, QString>::Iterator it;
         for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
                 qu += QString( ",%1 VARCHAR(10)" ).arg( it.data() );
         }
         qu += " );";
                 
-        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) );";
 
         qWarning( "command: %s", qu.latin1() );
 
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success )
                 return false;
 
         update();
 
         return true;
 }
 
 void ODateBookAccessBackend_SQL::update()
 {
 
         QString qu = "select uid from datebook";
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 // m_uids.clear();
                 return;
         }
         
         m_uids = extractUids( res );
         
 }
 
 bool ODateBookAccessBackend_SQL::reload() 
 {
         return load();
 }
 
 bool ODateBookAccessBackend_SQL::save() 
 {
         return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 
 QArray<int> ODateBookAccessBackend_SQL::allRecords()const 
 {
         return m_uids;
 }
 
 QArray<int> ODateBookAccessBackend_SQL::queryByExample(const OPimEvent&, int,  const QDateTime& ) {
         return QArray<int>();
 }
 
 void ODateBookAccessBackend_SQL::clear() 
 {
         QString qu = "drop table datebook;";
         qu += "drop table custom_data;";
 
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
 
         reload();
 }
 
 
 OPimEvent ODateBookAccessBackend_SQL::find( int uid ) const{
         QString qu = "select *";
         qu += "from datebook where uid = " + QString::number(uid);
 
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
 
         OSQLResultItem resItem = res.first();
 
         // Create Map for date event and insert UID
         QMap<int,QString> dateEventMap;
         dateEventMap.insert( OPimEvent::FUid, QString::number( uid ) );
 
         // Now insert the data out of the columns into the map.
         QMapConstIterator<int, QString> it;
         for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
                 dateEventMap.insert( m_reverseFieldMap[*it], resItem.data( *it ) );
         }
 
-        // 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;
 }
 
 // FIXME: Speed up update of uid's..
 bool ODateBookAccessBackend_SQL::add( const OPimEvent& ev ) 
 {
         QMap<int,QString> eventMap = ev.toMap();
 
         QString qu = "insert into datebook VALUES( " + QString::number( ev.uid() );
         QMap<int, QString>::Iterator it;
         for ( it = ++m_fieldMap.begin(); it != m_fieldMap.end(); ++it ){
                 if ( !eventMap[it.key()].isEmpty() )
                         qu += QString( ",\"%1\"" ).arg( eventMap[it.key()] );
                 else
                         qu += QString( ",\"\"" );
         }
         qu += " );";
 
         // Add custom entries
         int id = 0;
         QMap<QString, QString> customMap = ev.toExtraMap();
         for( QMap<QString, QString>::Iterator it = customMap.begin(); 
              it != customMap.end(); ++it ){
                 qu  += "insert into custom_data VALUES(" 
                         +  QString::number( ev.uid() )
                         + ","
                         +  QString::number( id++ ) 
                         + ",'" 
                         + it.key() //.latin1()
                         + "',"
                         + "0" // Priority for future enhancements
                         + ",'" 
                         + it.data() //.latin1()
                         + "');";
                 }       
         qWarning("add %s", qu.latin1() );
 
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 return false;
         }
 
         // Update list of uid's 
         update();
         
         return true;
 }
 
 // FIXME: Speed up update of uid's..
 bool ODateBookAccessBackend_SQL::remove( int uid ) 
 {
         QString qu = "DELETE from datebook where uid = " 
                 + QString::number( uid ) + ";";
         qu += "DELETE from custom_data where uid = " 
                 + QString::number( uid ) + ";";
         
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 return false;
         }
 
         // Update list of uid's
@@ -304,65 +341,92 @@ QArray<int> ODateBookAccessBackend_SQL::nonRepeats()const
         OSQLRawQuery raw( qu );
         OSQLResult res = m_driver->query( &raw );
         if ( res.state() != OSQLResult::Success ){
                 QArray<int> nix;
                 return nix;
         }
         
         return extractUids( res );
 }
 
 OPimEvent::ValueList ODateBookAccessBackend_SQL::directNonRepeats() 
 {
         QArray<int> nonRepUids = nonRepeats();
         OPimEvent::ValueList list;
 
         for (uint i = 0; i < nonRepUids.count(); ++i ){
                 list.append( find( nonRepUids[i] ) );
         }
 
         return list;
 
 }
 OPimEvent::ValueList ODateBookAccessBackend_SQL::directRawRepeats() 
 {
         QArray<int> rawRepUids = rawRepeats();
         OPimEvent::ValueList list;
 
         for (uint i = 0; i < rawRepUids.count(); ++i ){
                 list.append( find( rawRepUids[i] ) );
         }
 
         return list;
 }
 
 
 QArray<int> ODateBookAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
 {
         QArray<int> null;
         return null;
 }
 
 /* ===== Private Functions ========================================== */
 
 QArray<int> ODateBookAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
         qWarning("extractUids");
         QTime t;
         t.start();
         OSQLResultItem::ValueList list = res.results();
         OSQLResultItem::ValueList::Iterator it;
         QArray<int> ints(list.count() );
         qWarning(" count = %d", list.count() );
 
         int i = 0;
         for (it = list.begin(); it != list.end(); ++it ) {
                 ints[i] =  (*it).data("uid").toInt();
                 i++;
         }
         qWarning("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
 
         return ints;
 
 }
 
+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
@@ -27,71 +27,73 @@
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_DATE_BOOK_ACCESS_BACKEND_SQL__H
 #define OPIE_DATE_BOOK_ACCESS_BACKEND_SQL__H
 
 #include <qmap.h>
 #include <opie2/osqlresult.h>
 
 #include <opie2/odatebookaccessbackend.h>
 
 namespace Opie {
 namespace DB {
 class OSQLDriver;
 }
 }
 
 namespace Opie {
 /**
  * This is the default SQL implementation for DateBoook SQL storage
  * It fully implements the interface
  * @see ODateBookAccessBackend
  * @see OPimAccessBackend
  */
 class ODateBookAccessBackend_SQL : public ODateBookAccessBackend {
 public:
     ODateBookAccessBackend_SQL( const QString& appName,
                                 const QString& fileName = QString::null);
     ~ODateBookAccessBackend_SQL();
 
     bool load();
     bool reload();
     bool save();
 
     QArray<int> allRecords()const;
     QArray<int> matchRegexp(const QRegExp &r) const;
     QArray<int> queryByExample( const OPimEvent&, int, const QDateTime& d = QDateTime() );
     OPimEvent find( int uid )const;
     void clear();
     bool add( const OPimEvent& ev );
     bool remove( int uid );
     bool replace( const OPimEvent& ev );
 
     QArray<UID> rawEvents()const;
     QArray<UID> rawRepeats()const;
     QArray<UID> nonRepeats()const;
 
     OPimEvent::ValueList directNonRepeats();
     OPimEvent::ValueList directRawRepeats();
 
 private:
     bool loadFile();
     QString m_fileName;
     QArray<int> m_uids;
 
     QMap<int, QString> m_fieldMap;
     QMap<QString, int> m_reverseFieldMap;
 
     Opie::DB::OSQLDriver* m_driver;
 
     class Private;
     Private *d;
 
     void initFields();
     void update();
+
     QArray<int> extractUids( Opie::DB::OSQLResult& res ) const;
+    QMap<QString, QString> requestCustom( int uid ) const;
 
 };
 
 }
 
 #endif
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
@@ -1,728 +1,839 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
+                             Copyright (C) Holger Freyther (zecke@handhelds.org)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #include <qdatetime.h>
+#include <qmap.h>
+#include <qstring.h>
 
 #include <qpe/global.h>
 
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 #include <opie2/otodoaccesssql.h>
 #include <opie2/opimstate.h>
 #include <opie2/opimnotifymanager.h>
 #include <opie2/opimrecurrence.h>
 
 using namespace Opie::DB;
 
 using namespace Opie;
 /*
  * 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 OPimTodo to the table
      */
     class InsertQuery : public OSQLQuery {
     public:
         InsertQuery(const OPimTodo& );
         ~InsertQuery();
         QString query()const;
     private:
         OPimTodo 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(const QArray<int>& );
         ~FindQuery();
         QString query()const;
     private:
         QString single()const;
         QString multi()const;
         QArray<int> m_uids;
         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;
     };
 
 
+        /**
+         * 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() {}
     CreateQuery::~CreateQuery() {}
     QString CreateQuery::query()const {
         QString qu;
         qu += "create table todolist( uid PRIMARY KEY, categories, completed, ";
         qu += "description, summary, priority, DueDate, progress ,  state, ";
         // This is the recurrance-stuff .. Exceptions are currently not supported (see OPimRecurrence.cpp) ! (eilers)
         qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, "; 
         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;
     }
 
     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;
     }
 
     InsertQuery::InsertQuery( const OPimTodo& todo )
         : OSQLQuery(), m_todo( todo ) {
     }
     InsertQuery::~InsertQuery() {
     }
     /*
      * 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)
      */
     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();
         }
         int sYear = 0, sMonth = 0, sDay = 0;
         if( m_todo.hasStartDate() ){
                 QDate sDate = m_todo.startDate();
                 sYear = sDate.year();
                 sMonth= sDate.month();
                 sDay  = sDate.day();
         } 
 
         int eYear = 0, eMonth = 0, eDay = 0;
         if( m_todo.hasCompletedDate() ){
                 QDate eDate = m_todo.completedDate();
                 eYear = eDate.year();
                 eMonth= eDate.month();
                 eDay  = eDate.day();
         } 
         QString qu;
         QMap<int, QString> recMap = m_todo.recurrence().toMap();
         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(year).rightJustify( 4, '0' ) + "-" 
+                +       QString::number(month).rightJustify( 2, '0' )
+                +       "-" + QString::number( day ).rightJustify( 2, '0' )+ "'" + ","
                 +       QString::number( m_todo.progress() )            + ","
                 +       QString::number( m_todo.state().state() )       + ","
                 + "'" + recMap[ OPimRecurrence::RType ]                   + "'" + ","
                 + "'" + recMap[ OPimRecurrence::RWeekdays ]               + "'" + ","
                 + "'" + recMap[ OPimRecurrence::RPosition ]               + "'" + ","
                 + "'" + recMap[ OPimRecurrence::RFreq ]                   + "'" + ","
                 + "'" + recMap[ OPimRecurrence::RHasEndDate ]             + "'" + ","
                 + "'" + recMap[ OPimRecurrence::EndDate ]                 + "'" + ","
                 + "'" + recMap[ OPimRecurrence::Created ]                 + "'" + ","
                 + "'" + recMap[ OPimRecurrence::Exceptions ]              + "'" + ",";
         
         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(eYear) + "-"
-                +       QString::number(eMonth)
-                +       "-"+QString::number(eDay)                 + "'"
+                + "'" + QString::number(sYear).rightJustify( 4, '0' ) + "-" 
+                + QString::number(sMonth).rightJustify( 2, '0' )
+                + "-" + QString::number(sDay).rightJustify( 2, '0' )+ "'" + ","
+                + "'" + QString::number(eYear).rightJustify( 4, '0' ) + "-"
+                +       QString::number(eMonth).rightJustify( 2, '0' )
+                +       "-"+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;
     }
 
     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(const QArray<int>& ints)
         : OSQLQuery(), m_uids(ints){
     }
     FindQuery::~FindQuery() {
     }
     QString FindQuery::query()const{
         if (m_uids.count() == 0 )
             return single();
         else
             return multi();
     }
     QString FindQuery::single()const{
         QString qu = "select * from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
     QString FindQuery::multi()const {
         QString qu = "select * from todolist where ";
         for (uint i = 0; i < m_uids.count(); i++ ) {
             qu += " UID = " + QString::number( m_uids[i] ) + " OR";
         }
         qu.remove( qu.length()-2, 2 );
         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() );
+        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' ) );
 
         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() );
+                .arg( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
+                .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;
     }
     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() );
+                .arg( QString::number( m_start.year() ).rightJustify( 4, '0' ) )
+                .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;
     }
+
+        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;
+        }
+
 };
 
 
 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)
 {
     QString fi = file;
     if ( fi.isEmpty() )
         fi = Global::applicationFileName( "todolist", "todolist.db" );
     OSQLManager man;
     m_driver = man.standard();
     m_driver->setUrl(fi);
     // fillDict();
 }
 
 OPimTodoAccessBackendSQL::~OPimTodoAccessBackendSQL(){
         if( m_driver )
                 delete m_driver;
 }
 
 bool OPimTodoAccessBackendSQL::load(){
     if (!m_driver->open() )
         return false;
 
     CreateQuery creat;
     OSQLResult res = m_driver->query(&creat );
 
     m_dirty = true;
     return true;
 }
 bool OPimTodoAccessBackendSQL::reload(){
     return load();
 }
 
 bool OPimTodoAccessBackendSQL::save(){
     return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 QArray<int> OPimTodoAccessBackendSQL::allRecords()const {
     if (m_dirty )
         update();
 
     return m_uids;
 }
 QArray<int> OPimTodoAccessBackendSQL::queryByExample( const OPimTodo& , int, const QDateTime& ){
     QArray<int> ints(0);
     return ints;
 }
 OPimTodo OPimTodoAccessBackendSQL::find(int uid ) const{
     FindQuery query( uid );
     return todo( m_driver->query(&query) );
 
 }
 OPimTodo OPimTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
                                    uint cur, Frontend::CacheDirection dir ) const{
     uint CACHE = readAhead();
-    qWarning("searching for %d", uid );
+    qDebug("searching for %d", uid );
     QArray<int> search( CACHE );
     uint size =0;
     OPimTodo to;
 
     // we try to cache CACHE items
     switch( dir ) {
         /* forward */
     case 0: // FIXME: Not a good style to use magic numbers here (eilers)
         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];
             size++;
         }
         break;
         /* reverse */
     case 1: // FIXME: Not a good style to use magic numbers here (eilers)
         for (uint i = cur; i != 0 && size <  CACHE; i-- ) {
             search[size] = ints[i];
             size++;
         }
         break;
     }
     search.resize( size );
     FindQuery query( search );
     OSQLResult res = m_driver->query( &query  );
     if ( res.state() != OSQLResult::Success )
         return to;
 
     return todo( res );
 }
 void OPimTodoAccessBackendSQL::clear() {
     ClearQuery cle;
     OSQLResult res = m_driver->query( &cle );
     CreateQuery qu;
     res = m_driver->query(&qu);
 }
 bool OPimTodoAccessBackendSQL::add( const OPimTodo& 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 OPimTodoAccessBackendSQL::remove( int uid ) {
     RemoveQuery rem( uid );
     OSQLResult res = m_driver->query(&rem );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
 
     m_dirty = true;
     return true;
 }
 /*
  * FIXME better set query
  * but we need the cache for that
  * now we remove
  */
 bool OPimTodoAccessBackendSQL::replace( const OPimTodo& t) {
     remove( t.uid() );
     bool b= add(t);
     m_dirty = false; // we changed some stuff but the UID stayed the same
     return b;
 }
 QArray<int> OPimTodoAccessBackendSQL::overDue() {
     OverDueQuery qu;
     return uids( m_driver->query(&qu ) );
 }
 QArray<int> OPimTodoAccessBackendSQL::effectiveToDos( const QDate& s,
                                                    const QDate& t,
                                                    bool u) {
     EffQuery ef(s, t, u );
     return uids (m_driver->query(&ef) );
 }
 /*
  *
  */
 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;
     query = "select uid from todolist WHERE ";
 
     /*
      * Sort Filter stuff
      * not that straight forward
      * FIXME: Replace magic numbers
      *
      */
     /* Category */
     if ( sortFilter & 1 ) {
         QString str;
         if (cat != 0 ) str = QString::number( cat );
         query += " categories like '%" +str+"%' AND";
     }
     /* Show only overdue */
     if ( sortFilter & 2 ) {
         QDate date = QDate::currentDate();
         QString due;
         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";
     }
     /* not show completed */
     if ( sortFilter & 4 ) {
         query += " completed = 0 AND";
     }else{
        query += " ( completed = 1 OR  completed = 0) AND";
     }
-    /* srtip the end */
+    /* strip the end */
     query = query.remove( query.length()-3, 3 );
 
 
     /*
      * sort order stuff
      * quite straight forward
      */
     query += "ORDER BY ";
     switch( sortOrder ) {
         /* completed */
     case 0:
         query += "completed";
         break;
     case 1:
         query += "priority";
         break;
     case 2:
         query += "summary";
         break;
     case 3:
         query += "DueDate";
         break;
     }
 
     if ( !asc ) {
-        qWarning("not ascending!");
+        qDebug("not ascending!");
         query += " DESC";
     }
 
-    qWarning( query );
+    qDebug( query );
     OSQLRawQuery raw(query );
     return uids( m_driver->query(&raw) );
 }
 bool OPimTodoAccessBackendSQL::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;
     }
 }
-OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res) const{
+OPimTodo OPimTodoAccessBackendSQL::todo( const OSQLResult& res ) const{
     if ( res.state() == OSQLResult::Failure ) {
         OPimTodo to;
         return to;
     }
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it = list.begin();
-    qWarning("todo1");
+    qDebug("todo1");
     OPimTodo to = todo( (*it) );
     cache( to );
     ++it;
 
     for ( ; it != list.end(); ++it ) {
-        qWarning("caching");
+        qDebug("caching");
         cache( todo( (*it) ) );
     }
     return to;
 }
 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();
     hasDueDate = date( dueDate, item.data("DueDate") );
     QStringList cats = QStringList::split(";", item.data("categories") );
 
-    qWarning("Item is completed: %d", item.data("completed").toInt() );
+    qDebug("Item is completed: %d", item.data("completed").toInt() );
 
     OPimTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
               cats, item.data("summary"), item.data("description"),
               item.data("progress").toUShort(), hasDueDate, dueDate,
               item.data("uid").toInt() );
 
     bool isOk;
     int prioInt = QString( item.data("priority") ).toInt( &isOk );
     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 );
 
     QMap<int, QString> recMap;
     recMap.insert( OPimRecurrence::RType      , item.data("RType") );
     recMap.insert( OPimRecurrence::RWeekdays  , item.data("RWeekdays") );
     recMap.insert( OPimRecurrence::RPosition  , item.data("RPosition") );
     recMap.insert( OPimRecurrence::RFreq      , item.data("RFreq") );
     recMap.insert( OPimRecurrence::RHasEndDate, item.data("RHasEndDate") );
     recMap.insert( OPimRecurrence::EndDate    , item.data("EndDate") );
     recMap.insert( OPimRecurrence::Created    , item.data("Created") );
     recMap.insert( OPimRecurrence::Exceptions , item.data("Exceptions") );
     
     OPimRecurrence recur;
     recur.fromMap( recMap );
     to.setRecurrence( recur );
 
+    // Finally load the custom-entries for this UID and put it into the created object
+    to.setExtraMap( requestCustom( to.uid() ) );
+
     return to;
 }
 OPimTodo OPimTodoAccessBackendSQL::todo( int uid )const {
     FindQuery find( uid );
     return todo( m_driver->query(&find) );
 }
 /*
  * update the dict
  */
 void OPimTodoAccessBackendSQL::fillDict() {
+
+#if 0
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      * FIXME: Isn't this dict obsolete ? (eilers)
      */
     m_dict.setAutoDelete( TRUE );
     m_dict.insert("Categories" ,     new int(OPimTodo::Category)         );
     m_dict.insert("Uid" ,            new int(OPimTodo::Uid)              );
     m_dict.insert("HasDate" ,        new int(OPimTodo::HasDate)          );
     m_dict.insert("Completed" ,      new int(OPimTodo::Completed)        );
     m_dict.insert("Description" ,    new int(OPimTodo::Description)      );
     m_dict.insert("Summary" ,        new int(OPimTodo::Summary)          );
     m_dict.insert("Priority" ,       new int(OPimTodo::Priority)         );
     m_dict.insert("DateDay" ,        new int(OPimTodo::DateDay)          );
     m_dict.insert("DateMonth" ,      new int(OPimTodo::DateMonth)        );
     m_dict.insert("DateYear" ,       new int(OPimTodo::DateYear)         );
     m_dict.insert("Progress" ,       new int(OPimTodo::Progress)         );
     m_dict.insert("Completed",       new int(OPimTodo::Completed)        ); // Why twice ? (eilers)
     m_dict.insert("CrossReference",  new int(OPimTodo::CrossReference)   );
 //    m_dict.insert("HasAlarmDateTime",new int(OPimTodo::HasAlarmDateTime) ); // old stuff (eilers)
 //    m_dict.insert("AlarmDateTime",   new int(OPimTodo::AlarmDateTime)    ); // old stuff (eilers)
+
+#endif
 }
 /*
  * need to be const so let's fool the
  * compiler :(
  */
 void OPimTodoAccessBackendSQL::update()const {
     ((OPimTodoAccessBackendSQL*)this)->m_dirty = false;
     LoadQuery lo;
     OSQLResult res = m_driver->query(&lo);
     if ( res.state() != OSQLResult::Success )
         return;
 
     ((OPimTodoAccessBackendSQL*)this)->m_uids = uids( res );
 }
 QArray<int> OPimTodoAccessBackendSQL::uids( const OSQLResult& res) const{
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it;
     QArray<int> ints(list.count() );
-    qWarning(" count = %d", list.count() );
+    qDebug(" count = %d", list.count() );
 
     int i = 0;
     for (it = list.begin(); it != list.end(); ++it ) {
         ints[i] =  (*it).data("uid").toInt();
         i++;
     }
     return ints;
 }
 
 QArray<int> OPimTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
 {
 
 #warning OPimTodoAccessBackendSQL::matchRegexp() not implemented !!
 
 #if 0
 
         Copied from xml-backend by not adapted to sql (eilers)
 
         QArray<int> m_currentQuery( m_events.count() );
         uint arraycounter = 0;
 
 
 
         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();
 
         }
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 #endif
         QArray<int> empty;
         return empty;
 }
 QBitArray OPimTodoAccessBackendSQL::supports()const {
 
         return sup();
 }
 
 QBitArray OPimTodoAccessBackendSQL::sup() const{
 
         QBitArray ar( OPimTodo::CompletedDate + 1 );
         ar.fill( true );
         ar[OPimTodo::CrossReference] = false;
         ar[OPimTodo::State ] = false;
         ar[OPimTodo::Reminders] = false;
         ar[OPimTodo::Notifiers] = false;
         ar[OPimTodo::Maintainer] = false;
         
         return ar;
 }
 
 void OPimTodoAccessBackendSQL::removeAllCompleted(){
 #warning OPimTodoAccessBackendSQL::removeAllCompleted() not implemented !!
 
 }
 
+
+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
@@ -1,92 +1,93 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_PIM_ACCESS_SQL_H
 #define OPIE_PIM_ACCESS_SQL_H
 
-#include <qasciidict.h>
+/* #include <qasciidict.h> */
 
 #include <opie2/otodoaccessbackend.h>
 
 namespace Opie {
 namespace DB   {
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
 }
 }
 
 namespace Opie {
 
 class OPimTodoAccessBackendSQL : public OPimTodoAccessBackend {
 public:
     OPimTodoAccessBackendSQL( const QString& file );
     ~OPimTodoAccessBackendSQL();
 
     bool load();
     bool reload();
     bool save();
     QArray<int> allRecords()const;
 
     QArray<int> queryByExample( const OPimTodo& t, int settings, const QDateTime& d = QDateTime() );
     OPimTodo find(int uid)const;
     OPimTodo find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
     void clear();
     bool add( const OPimTodo& t );
     bool remove( int uid );
     bool replace( const OPimTodo& 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 );
 
     QBitArray supports()const;
     QArray<int> matchRegexp(  const QRegExp &r ) const;
     void removeAllCompleted();
     
 
 private:
     void update()const;
     void fillDict();
     inline bool date( QDate& date, const QString& )const;
     inline OPimTodo todo( const Opie::DB::OSQLResult& )const;
     inline OPimTodo todo( Opie::DB::OSQLResultItem& )const;
     inline QArray<int> uids( const Opie::DB::OSQLResult& )const;
     OPimTodo todo( int uid )const;
     QBitArray sup() const;
+    QMap<QString, QString>  requestCustom( int uid ) const;
 
-    QAsciiDict<int> m_dict;
+    // QAsciiDict<int> m_dict;
     Opie::DB::OSQLDriver* m_driver;
     QArray<int> m_uids;
     bool m_dirty : 1;
 };
 
 }
 
 #endif
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
@@ -1,67 +1,67 @@
 /*
                              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>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 
 #ifndef OCONTACT_H
 #define OCONTACT_H
 
 /* OPIE */
 #include <opie2/opimrecord.h>
 #include <qpe/recordfields.h>
 
 /* QT */
 #include <qdatetime.h>
 #include <qstringlist.h>
 
 #if defined(QPC_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>;
 // MOC_SKIP_END
 #endif
 
 namespace Opie
 {
 class OPimContactPrivate;
 
 /**
  * OPimContact class represents a specialised PIM Record for contacts.
  * It does store all kind of persopn related information.
  *
  * @short Contact Container
  * @author TT, Stefan Eiler, Holger Freyther
  */
 class QPC_EXPORT OPimContact : public OPimRecord
 {
     friend class DataSet;
 
   public:
     OPimContact();
     OPimContact( const QMap<int, QString> &fromMap );
     virtual ~OPimContact();
 
     enum DateFormat{