Added first experimental incarnation of sql-backend for addressbook.

Some modifications to be able to compile the todo sql-backend.
A lot of changes fill follow...

13 files changed, 1492 insertions, 24 deletions

diff --git a/libopie/pim/obackendfactory.h b/libopie/pim/obackendfactory.h
index f3c339d..3567687 100644
--- a/libopie/pim/obackendfactory.h
+++ b/libopie/pim/obackendfactory.h
@@ -1,166 +1,176 @@
 /*
  * Class to manage Backends.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation;
  *      either version 2 of the License, or (at your option) any later
  *      version.
  * =====================================================================
  * ToDo: Use plugins
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.8  2003/09/22 14:31:16  eilers
+ * Added first experimental incarnation of sql-backend for addressbook.
+ * Some modifications to be able to compile the todo sql-backend.
+ * A lot of changes fill follow...
+ *
  * Revision 1.7  2003/08/01 12:30:16  eilers
  * Merging changes from BRANCH_1_0 to HEAD
  *
  * Revision 1.6.4.1  2003/06/30 14:34:19  eilers
  * Patches from Zecke:
  * Fixing and cleaning up extraMap handling
  * Adding d_ptr for binary compatibility in the future
  *
  * Revision 1.6  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.5  2003/02/21 23:31:52  zecke
  * Add XML datebookresource
  * -clean up todoaccessxml header
  * -implement some more stuff in the oeven tester
  * -extend DefaultFactory to not crash and to use datebook
  *
  * -reading of OEvents is working nicely.. saving will be added
  *  tomorrow
  *  -fix spelling in ODateBookAcces
  *
  * Revision 1.4  2002/10/14 15:55:18  eilers
  * Redeactivate SQL.. ;)
  *
  * Revision 1.3  2002/10/10 17:08:58  zecke
  * The Cache is finally in place
  * I tested it with my todolist and it 'works' for 10.000 todos the hits are awesome ;)
  * The read ahead functionality does not make sense for XMLs backends because most of the stuff is already in memory. While using readahead on SQL makes things a lot faster....
  * I still have to fully implement read ahead
  * This change is bic but sc
  *
  * Revision 1.2  2002/10/08 09:27:36  eilers
  * Fixed libopie.pro to include the new pim-API.
  * The SQL-Stuff is currently deactivated. Otherwise everyone who wants to
  * compile itself would need to install libsqlite, libopiesql...
  * Therefore, the backend currently uses XML only..
  *
  * Revision 1.1  2002/10/07 17:35:01  eilers
  * added OBackendFactory for advanced backend access
  *
  *
  * =====================================================================
  */
 #ifndef OPIE_BACKENDFACTORY_H_
 #define OPIE_BACKENDFACTORY_H_
 
 #include <qstring.h>
 #include <qasciidict.h>
 #include <qpe/config.h>
 
 #include "otodoaccessxml.h"
 #include "ocontactaccessbackend_xml.h"
 #include "odatebookaccessbackend_xml.h"
 
 #ifdef __USE_SQL
 #include "otodoaccesssql.h"
+#include "ocontactaccessbackend_sql.h"
 #endif
 
 class OBackendPrivate;
 
 /**
  * This class is our factory. It will give us the default implementations
  * of at least Todolist, Contacts and Datebook. In the future this class will
  * allow users to switch the backend with ( XML->SQLite ) without the need
  * to recompile.#
  * This class as the whole PIM Api is making use of templates
  *
  * <pre>
  *   OTodoAccessBackend* backend = OBackEndFactory<OTodoAccessBackend>::Default("todo", QString::null );
  *   backend->load();
  * </pre>
  *
  * @author Stefan Eilers
  * @version 0.1
  */
 template<class T>
 class OBackendFactory
 {
  public:
 	OBackendFactory() {};
 
 	enum BACKENDS {
 		TODO,
 		CONTACT,
 		DATE
 	};
 
         /**
          * Returns a backend implementation for backendName
          * @param backendName the type of the backend
          * @param appName will be passed on to the backend
          */
 	static T* Default( const QString backendName, const QString& appName ){
 
 		// __asm__("int3");
 
 		Config config( "pimaccess" );
 		config.setGroup ( backendName );
 		QString backend = config.readEntry( "usebackend" );
 
+		qWarning("Selected backend for %s is: %s", backendName.latin1(), backend.latin1() ); 
+
 		QAsciiDict<int> dict ( 3 );
 		dict.setAutoDelete ( TRUE );
 
 		dict.insert( "todo", new int (TODO) );
 		dict.insert( "contact", new int (CONTACT) );
                 dict.insert( "datebook", new int(DATE) );
 
-		qWarning ("TODO is: %d", TODO);
-		qWarning ("CONTACT is: %d", CONTACT);
-
                 int *find = dict[ backendName ];
                 if (!find ) return 0;
 
 		switch ( *find ){
 		case TODO:
 #ifdef __USE_SQL
 			if ( backend == "sql" )
 				return (T*) new OTodoAccessBackendSQL("");
 #else
 			if ( backend == "sql" )
 				qWarning ("OBackendFactory:: sql Backend not implemented! Using XML instead!");
 #endif
 
 			return (T*) new OTodoAccessXML( appName );
 		case CONTACT:
+#ifdef __USE_SQL
+			if ( backend == "sql" )
+				return (T*) new OContactAccessBackend_SQL("");
+#else
 			if ( backend == "sql" )
 				qWarning ("OBackendFactory:: sql Backend not implemented! Using XML instead!");
+#endif
 
 			return (T*) new OContactAccessBackend_XML( appName );
 		case DATE:
 			if ( backend == "sql" )
                             qWarning("OBackendFactory:: sql Backend not implemented! Using XML instead!");
 
 			return (T*) new ODateBookAccessBackend_XML( appName );
 		default:
 			return NULL;
 		}
 
 
 	}
     private:
 	OBackendPrivate* d;
 };
 
 
 #endif
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 9a1a8dc..1d46b81 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -1,245 +1,240 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 ** Copyright (C) 2002-2003 by Stefan Eilers (eilers.stefan@epost.de)
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef __OCONTACT_H__
 #define __OCONTACT_H__
 
 #include <opie/opimrecord.h>
 #include <qpe/recordfields.h>
 
 #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
 
 class OContactPrivate;
 
 /**
  * OContact 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 OContact : public OPimRecord
 {
     friend class DataSet;
 public:
     OContact();
     OContact( const QMap<int, QString> &fromMap );
     virtual ~OContact();
 
     enum DateFormat{
 	    Zip_City_State = 0,
 	    City_State_Zip
     };
 
     /*
      * do we need to inline them
      * if yes do we need to inline them this way?
      * -zecke
      */
     void setTitle( const QString &v ) { replace( Qtopia::Title, v ); }
     void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); }
     void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); }
     void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); }
     void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); }
     void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); }
     void setFileAs();
 
     // default email address
     void setDefaultEmail( const QString &v );
     // inserts email to list and ensure's doesn't already exist
     void insertEmail( const QString &v );
     void removeEmail( const QString &v );
     void clearEmails();
     void insertEmails( const QStringList &v );
 
     // home
     void setHomeStreet( const QString &v ) { replace( Qtopia::HomeStreet, v ); }
     void setHomeCity( const QString &v ) { replace( Qtopia::HomeCity, v ); }
     void setHomeState( const QString &v ) { replace( Qtopia::HomeState, v ); }
     void setHomeZip( const QString &v ) { replace( Qtopia::HomeZip, v ); }
     void setHomeCountry( const QString &v ) { replace( Qtopia::HomeCountry, v ); }
     void setHomePhone( const QString &v ) { replace( Qtopia::HomePhone, v ); }
     void setHomeFax( const QString &v ) { replace( Qtopia::HomeFax, v ); }
     void setHomeMobile( const QString &v ) { replace( Qtopia::HomeMobile, v ); }
     void setHomeWebpage( const QString &v ) { replace( Qtopia::HomeWebPage, v ); }
 
     // business
     void setCompany( const QString &v ) { replace( Qtopia::Company, v ); }
     void setBusinessStreet( const QString &v ) { replace( Qtopia::BusinessStreet, v ); }
     void setBusinessCity( const QString &v ) { replace( Qtopia::BusinessCity, v ); }
     void setBusinessState( const QString &v ) { replace( Qtopia::BusinessState, v ); }
     void setBusinessZip( const QString &v ) { replace( Qtopia::BusinessZip, v ); }
     void setBusinessCountry( const QString &v ) { replace( Qtopia::BusinessCountry, v ); }
     void setBusinessWebpage( const QString &v ) { replace( Qtopia::BusinessWebPage, v ); }
     void setJobTitle( const QString &v ) { replace( Qtopia::JobTitle, v ); }
     void setDepartment( const QString &v ) { replace( Qtopia::Department, v ); }
     void setOffice( const QString &v ) { replace( Qtopia::Office, v ); }
     void setBusinessPhone( const QString &v ) { replace( Qtopia::BusinessPhone, v ); }
     void setBusinessFax( const QString &v ) { replace( Qtopia::BusinessFax, v ); }
     void setBusinessMobile( const QString &v ) { replace( Qtopia::BusinessMobile, v ); }
     void setBusinessPager( const QString &v ) { replace( Qtopia::BusinessPager, v ); }
     void setProfession( const QString &v ) { replace( Qtopia::Profession, v ); }
     void setAssistant( const QString &v ) { replace( Qtopia::Assistant, v ); }
     void setManager( const QString &v ) { replace( Qtopia::Manager, v ); }
 
     // personal
     void setSpouse( const QString &v ) { replace( Qtopia::Spouse, v ); }
     void setGender( const QString &v ) { replace( Qtopia::Gender, v ); }
     void setBirthday( const QDate &v );
     void setAnniversary( const QDate &v );
     void setNickname( const QString &v ) { replace( Qtopia::Nickname, v ); }
     void setChildren( const QString &v );
 
     // other
     void setNotes( const QString &v ) { replace( Qtopia::Notes, v); }
 
     virtual bool match( const QRegExp &regexp ) const;
 
 //     // custom
 //     void setCustomField( const QString &key, const QString &v )
 //         { replace(Custom- + key, v ); }
 
     // name
     QString fullName() const;
     QString title() const { return find( Qtopia::Title ); }
     QString firstName() const { return find( Qtopia::FirstName ); }
     QString middleName() const { return find( Qtopia::MiddleName ); }
     QString lastName() const { return find( Qtopia::LastName ); }
     QString suffix() const { return find( Qtopia::Suffix ); }
     QString fileAs() const { return find( Qtopia::FileAs ); }
 
     // email
     QString defaultEmail() const { return find( Qtopia::DefaultEmail ); }
     QStringList emailList() const;
 
     // home
     /*
      * OPimAddress address(enum Location)const;
      * would be some how nicer...
      *  -zecke
      */
     QString homeStreet() const { return find( Qtopia::HomeStreet ); }
     QString homeCity() const { return find( Qtopia::HomeCity ); }
     QString homeState() const { return find( Qtopia::HomeState ); }
     QString homeZip() const { return find( Qtopia::HomeZip ); }
     QString homeCountry() const { return find( Qtopia::HomeCountry ); }
     QString homePhone() const { return find( Qtopia::HomePhone ); }
     QString homeFax() const { return find( Qtopia::HomeFax ); }
     QString homeMobile() const { return find( Qtopia::HomeMobile ); }
     QString homeWebpage() const { return find( Qtopia::HomeWebPage ); }
     /** Multi line string containing all non-empty address info in the form
     * Street
     * City, State Zip
     * Country
     */
     QString displayHomeAddress() const;
 
     // business
     QString company() const { return find( Qtopia::Company ); }
     QString businessStreet() const { return find( Qtopia::BusinessStreet ); }
     QString businessCity() const { return find( Qtopia::BusinessCity ); }
     QString businessState() const { return find( Qtopia::BusinessState ); }
     QString businessZip() const { return find( Qtopia::BusinessZip ); }
     QString businessCountry() const { return find( Qtopia::BusinessCountry ); }
     QString businessWebpage() const { return find( Qtopia::BusinessWebPage ); }
     QString jobTitle() const { return find( Qtopia::JobTitle ); }
     QString department() const { return find( Qtopia::Department ); }
     QString office() const { return find( Qtopia::Office ); }
     QString businessPhone() const { return find( Qtopia::BusinessPhone ); }
     QString businessFax() const { return find( Qtopia::BusinessFax ); }
     QString businessMobile() const { return find( Qtopia::BusinessMobile ); }
     QString businessPager() const { return find( Qtopia::BusinessPager ); }
     QString profession() const { return find( Qtopia::Profession ); }
     QString assistant() const { return find( Qtopia::Assistant ); }
     QString manager() const { return find( Qtopia::Manager ); }
      /** Multi line string containing all non-empty address info in the form
     * Street
     * City, State Zip
     * Country
     */
     QString displayBusinessAddress() const;
 
     //personal
     QString spouse() const { return find( Qtopia::Spouse ); }
     QString gender() const { return find( Qtopia::Gender ); }
     QDate birthday() const;
     QDate anniversary() const;
     QString nickname() const { return find( Qtopia::Nickname ); }
     QString children() const { return find( Qtopia::Children ); }
     QStringList childrenList() const;
 
     // other
     QString notes() const { return find( Qtopia::Notes ); }
     QString groups() const { return find( Qtopia::Groups ); }
     QStringList groupList() const;
 
-//     // custom
-//     const QString &customField( const QString &key )
-//         { return find( Custom- + key ); }
-
-
     QString toRichText() const;
     QMap<int, QString> toMap() const;
     QString field( int key ) const { return find( key ); }
 
 
     void setUid( int i );
 
     QString toShortText()const;
-    QString OContact::type()const;
-    QMap<QString,QString> OContact::toExtraMap() const;
-    class QString OContact::recordField(int) const;
+    QString type()const;
+    class QString recordField(int) const;
 
     // Why private ? (eilers,se)
     QString emailSeparator() const { return " "; }
+
     // the emails should be seperated by a comma
     void setEmails( const QString &v );
     QString emails() const { return find( Qtopia::Emails ); }
     static int rtti();
 
 private:
-    // The XML-Backend needs some access to the private functions
+    // The XML Backend needs some access to the private functions
     friend class OContactAccessBackend_XML;
 
     void insert( int key, const QString &value );
     void replace( int key, const QString &value );
     QString find( int key ) const;
     static QStringList fields();
 
     void save( QString &buf ) const;
 
     QString displayAddress( const QString &street,
 			    const QString &city,
 			    const QString &state,
 			    const QString &zip,
 			    const QString &country ) const;
 
     QMap<int, QString> mMap;
     OContactPrivate *d;
 };
 
 
 #endif
diff --git a/libopie/pim/ocontactaccessbackend_sql.cpp b/libopie/pim/ocontactaccessbackend_sql.cpp
new file mode 100644
index 0000000..4afa5f3
--- a/dev/null
+++ b/libopie/pim/ocontactaccessbackend_sql.cpp
@@ -0,0 +1,664 @@
+/*
+ * SQL Backend for the OPIE-Contact Database.
+ *
+ * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
+ *
+ * =====================================================================
+ *	This program is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Library General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * =====================================================================
+ * =====================================================================
+ * Version: $Id$
+ * =====================================================================
+ * History:
+ * $Log$
+ * Revision 1.1  2003/09/22 14:31:16  eilers
+ * Added first experimental incarnation of sql-backend for addressbook.
+ * Some modifications to be able to compile the todo sql-backend.
+ * A lot of changes fill follow...
+ *
+ */
+
+#include "ocontactaccessbackend_sql.h"
+
+#include <qarray.h>
+#include <qdatetime.h>
+#include <qstringlist.h>
+
+#include <qpe/global.h>
+#include <qpe/recordfields.h>
+
+#include <opie/ocontactfields.h>
+#include <opie/oconversion.h>
+#include <opie2/osqldriver.h>
+#include <opie2/osqlresult.h>
+#include <opie2/osqlmanager.h>
+#include <opie2/osqlquery.h>
+
+/*
+ * Implementation of used query types
+ * CREATE query
+ * LOAD query
+ * INSERT
+ * REMOVE
+ * CLEAR
+ */
+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 OContact to the table
+	 */
+	class InsertQuery : public OSQLQuery {
+	public:
+		InsertQuery(const OContact& );
+		~InsertQuery();
+		QString query()const;
+	private:
+		OContact 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:
+	// 1. addressbook  : It contains General information about the contact (non custom)
+	// 2. dates        : Stuff like birthdays, anniversaries, etc.
+	// 3. 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 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, priority INTEGER, value VARCHAR, PRIMARY KEY /* identifier */ (uid, id) );";
+// 		qu += "create table dates( uid PRIMARY KEY, type, day, month, year, hour, minute, second );";
+		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;
+	}
+
+// Distinct loading is not very fast. If I expect that every person has just
+// one (and always one) 'Last Name', I can request all uid's for existing lastnames, 
+// which is faster..
+// But this may not be true for all entries, like company contacts..
+// The current AddressBook application handles this problem, but other may not.. (eilers)
+#define __USE_SUPERFAST_LOADQUERY
+
+	LoadQuery::LoadQuery() : OSQLQuery() {}
+	LoadQuery::~LoadQuery() {}
+	QString LoadQuery::query()const {
+		QString qu;
+#ifndef __USE_SUPERFAST_LOADQUERY 
+		qu += "select distinct uid from addressbook";
+#else
+		qu += "select uid from addressbook where type = 'Last Name'";
+#endif
+		
+		return qu;
+	}
+	
+
+	InsertQuery::InsertQuery( const OContact& contact )
+		: OSQLQuery(), m_contact( contact ) {
+	}
+
+	InsertQuery::~InsertQuery() {
+	}
+
+	/*
+	 * converts from a OContact to a query
+	 */
+	QString InsertQuery::query()const{
+
+		// Get all information out of the contact-class
+		// Remember: The category is stored in contactMap, too ! 
+		QMap<int, QString> contactMap = m_contact.toMap();
+		QMap<QString, QString> customMap = m_contact.toExtraMap();
+		
+		QMap<QString, QString> addressbook_db;
+		
+		// Get the translation from the ID to the String
+		QMap<int, QString> transMap = OContactFields::idToUntrFields();
+		
+		for( QMap<int, QString>::Iterator it = contactMap.begin(); 
+		     it != contactMap.end(); ++it ){
+			switch ( it.key() ){
+			case Qtopia::Birthday:{
+				// These entries should stored in a special format
+				// year-month-day
+				QDate day = m_contact.birthday();
+				addressbook_db.insert( transMap[it.key()], 
+						       QString("%1-%2-%3")
+						       .arg( day.year() )
+						       .arg( day.month() )
+						       .arg( day.day() ) );
+			}
+				break;
+			case Qtopia::Anniversary:{
+				// These entries should stored in a special format
+				// year-month-day
+				QDate day = m_contact.anniversary();
+				addressbook_db.insert( transMap[it.key()], 
+						       QString("%1-%2-%3")
+						       .arg( day.year() )
+						       .arg( day.month() )
+						       .arg( day.day() ) );
+			}
+				break;
+			case Qtopia::AddressUid: // Ignore UID
+				break;
+			default: // Translate id to String
+				addressbook_db.insert( transMap[it.key()], it.data() );
+				break;
+			}
+		
+		}
+		
+		// Now convert this whole stuff into a SQL String, beginning with
+		// the addressbook table..
+		QString qu;
+		// qu  += "begin transaction;";
+		int id = 0;
+		for( QMap<QString, QString>::Iterator it = addressbook_db.begin(); 
+		     it != addressbook_db.end(); ++it ){
+			qu  += "insert into addressbook VALUES(" 
+				+  QString::number( m_contact.uid() )
+				+ ","
+				+  QString::number( id++ ) 
+				+ ",'" 
+				+ it.key() //.latin1()
+				+ "',"
+				+ "0"  // Priority for future enhancements
+				+ ",'" 
+				+ it.data()  //.latin1()
+				+ "');";
+		}
+
+		// Now add custom data..
+		id = 0;
+		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()
+				+ "',"
+				+ "0" // Priority for future enhancements
+				+ ",'" 
+				+ it.data() //.latin1()
+				+ "');";
+		}		
+		
+		// qu  += "commit;";
+		qWarning("add %s", qu.latin1() );
+		return qu;
+	}
+	
+
+	RemoveQuery::RemoveQuery(int uid )
+		: OSQLQuery(), m_uid( uid ) {}
+	RemoveQuery::~RemoveQuery() {}
+	QString RemoveQuery::query()const {
+		QString qu = "DELETE from addressbook where uid = " 
+			+ QString::number(m_uid) + ";";
+		qu += "DELETE from dates 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 uid, type, value from addressbook where uid = ";
+		qu += QString::number(m_uid);
+		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;
+	}
+
+};
+
+
+/* --------------------------------------------------------------------------- */
+
+OContactAccessBackend_SQL::OContactAccessBackend_SQL ( const QString& /* appname */, 
+						       const QString& filename ): m_changed(false)
+{
+	qWarning("C'tor OContactAccessBackend_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 OContactAccessBackend_SQL ends: %d", t.elapsed() );
+}
+
+
+bool OContactAccessBackend_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 OContactAccessBackend_SQL::reload()
+{
+	return load();
+}
+
+bool OContactAccessBackend_SQL::save()
+{
+	return m_driver->close();
+}
+
+
+void OContactAccessBackend_SQL::clear ()
+{
+	ClearQuery cle;
+	OSQLResult res = m_driver->query( &cle );
+	CreateQuery qu;
+	res = m_driver->query(&qu);
+}
+
+bool OContactAccessBackend_SQL::wasChangedExternally()
+{
+	return false;
+}
+
+QArray<int> OContactAccessBackend_SQL::allRecords() const
+{
+
+	// FIXME: Think about cute handling of changed tables..
+	// Thus, we don't have to call update here...
+ 	if ( m_changed )  
+		((OContactAccessBackend_SQL*)this)->update();
+	
+	return m_uids;
+}
+
+bool OContactAccessBackend_SQL::add ( const OContact &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 OContactAccessBackend_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 OContactAccessBackend_SQL::replace ( const OContact &contact )
+{
+	if ( !remove( contact.uid() ) )
+		return false;
+	
+	return add( contact );
+}
+
+
+OContact OContactAccessBackend_SQL::find ( int uid ) const
+{
+	qWarning("OContactAccessBackend_SQL::find()");
+	QTime t;
+	t.start();
+
+	OContact retContact( requestNonCustom( uid ) );
+	retContact.setExtraMap( requestCustom( uid ) );
+
+	qWarning("OContactAccessBackend_SQL::find() needed: %d", t.elapsed() );
+	return retContact;
+}
+
+
+
+QArray<int> OContactAccessBackend_SQL::queryByExample ( const OContact &query, int settings, const QDateTime& d = QDateTime() )
+{
+	QArray<int> nix(0);
+	return nix;
+}
+
+QArray<int> OContactAccessBackend_SQL::matchRegexp(  const QRegExp &r ) const
+{
+	QArray<int> nix(0);
+	return nix;
+}
+
+const uint OContactAccessBackend_SQL::querySettings()
+{
+	return 0;
+}
+
+bool OContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
+{
+	return false;
+}
+
+QArray<int> OContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
+{
+	QTime t;
+	t.start();
+
+	// Not implemented..
+	QString query = "SELECT uid FROM addressbook WHERE type = 'Last Name' ";
+
+	query += "ORDER BY value ";
+	if ( !asc )
+		query += "DESC";
+
+	qWarning("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() );
+	return list;
+}
+
+
+void OContactAccessBackend_SQL::update()
+{
+	qWarning("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", t.elapsed() );
+}
+
+QArray<int> OContactAccessBackend_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<int, QString>  OContactAccessBackend_SQL::requestNonCustom( int uid ) const
+{
+	QTime t;
+	t.start();
+
+	QMap<int, QString> nonCustomMap;
+	
+	int t2needed = 0;
+	QTime t2;
+	t2.start();
+	FindQuery query( uid );
+	OSQLResult res_noncustom = m_driver->query( &query );
+	t2needed = t2.elapsed();
+
+	if ( res_noncustom.state() == OSQLResult::Failure ) {
+		qWarning("OSQLResult::Failure in find query !!");
+		QMap<int, QString> empty;
+		return empty;
+	}	
+
+	int t3needed = 0;
+	QTime t3;
+	t3.start();
+	QMap<QString, int> translateMap = OContactFields::untrFieldsToId();
+
+	OSQLResultItem::ValueList list = res_noncustom.results();
+	OSQLResultItem::ValueList::Iterator it = list.begin();
+	for ( ; it != list.end(); ++it ) {
+		if ( (*it).data("type") != "" ){
+			int typeId = translateMap[(*it).data( "type" )];
+			switch( typeId ){
+			case Qtopia::Birthday:
+			case Qtopia::Anniversary:{
+				// Birthday and Anniversary are encoded special ( yyyy-mm-dd )
+				QStringList list = QStringList::split( '-', (*it).data( "value" ) );
+				QStringList::Iterator lit = list.begin();
+				int year  = (*lit).toInt();
+				qWarning("1. %s", (*lit).latin1());
+				int month = (*(++lit)).toInt();
+				qWarning("2. %s", (*lit).latin1());
+				int day   = (*(++lit)).toInt();
+				qWarning("3. %s", (*lit).latin1());
+				qWarning( "RequestNonCustom->Converting:%s to Year: %d, Month: %d, Day: %d ", (*it).data( "value" ).latin1(), year, month, day );
+				QDate date( year, month, day );
+				nonCustomMap.insert( typeId, OConversion::dateToString( date ) );
+			}
+				break;
+			default:
+				nonCustomMap.insert( typeId, 
+						     (*it).data( "value" ) );
+			}
+		}
+	}
+	// Add UID to Map..
+	nonCustomMap.insert( Qtopia::AddressUid, QString::number( uid ) );
+	t3needed = t3.elapsed();
+
+	qWarning("RequestNonCustom needed: ins:%d, query: %d, mapping: %d", t.elapsed(), t2needed, t3needed  );
+	return nonCustomMap;
+}
+
+QMap<QString, QString>  OContactAccessBackend_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", t.elapsed() );
+	return customMap;
+}
diff --git a/libopie/pim/ocontactaccessbackend_sql.h b/libopie/pim/ocontactaccessbackend_sql.h
new file mode 100644
index 0000000..bb22551
--- a/dev/null
+++ b/libopie/pim/ocontactaccessbackend_sql.h
@@ -0,0 +1,96 @@
+/*
+ * SQL Backend for the OPIE-Contact Database.
+ *
+ * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
+ *
+ * =====================================================================
+ *	This program is free software; you can redistribute it and/or
+ *	modify it under the terms of the GNU Library General Public
+ *      License as published by the Free Software Foundation; either
+ *      version 2 of the License, or (at your option) any later version.
+ * =====================================================================
+ *
+ *
+ * =====================================================================
+ * Version: $Id$
+ * =====================================================================
+ * History:
+ * $Log$
+ * Revision 1.1  2003/09/22 14:31:16  eilers
+ * Added first experimental incarnation of sql-backend for addressbook.
+ * Some modifications to be able to compile the todo sql-backend.
+ * A lot of changes fill follow...
+ *
+ *
+ */
+
+#ifndef _OContactAccessBackend_SQL_
+#define _OContactAccessBackend_SQL_
+
+#include "ocontactaccessbackend.h"
+#include "ocontactaccess.h"
+
+#include <qlist.h>
+#include <qdict.h>
+
+class OSQLDriver;
+class OSQLResult;
+class OSQLResultItem;
+
+/* the default xml implementation */
+/**
+ * This class is the SQL implementation of a Contact backend
+ * it does implement everything available for OContact.
+ * @see OPimAccessBackend for more information of available methods
+ */
+class OContactAccessBackend_SQL : public OContactAccessBackend {
+ public:
+	OContactAccessBackend_SQL ( const QString& appname, const QString& filename = QString::null );
+
+	bool save();
+
+	bool load ();
+
+	void clear ();
+
+	bool wasChangedExternally();
+
+	QArray<int> allRecords() const;
+
+	OContact find ( int uid ) const;
+	// FIXME: Add lookahead-cache support !
+	//OContact find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
+
+	QArray<int> queryByExample ( const OContact &query, int settings, 
+				     const QDateTime& d );
+
+	QArray<int> matchRegexp(  const QRegExp &r ) const;
+
+	const uint querySettings();
+
+	bool hasQuerySettings (uint querySettings) const;
+
+	// Currently only asc implemented..
+	QArray<int> sorted( bool asc,  int , int ,  int );
+	bool add ( const OContact &newcontact );
+
+	bool replace ( const OContact &contact );
+
+	bool remove ( int uid );
+	bool reload();
+
+ private:
+	QArray<int> extractUids( OSQLResult& res ) const;
+	QMap<int, QString>  requestNonCustom( int uid ) const;
+	QMap<QString, QString>  requestCustom( int uid ) const;
+	void update();
+
+ protected:
+	bool m_changed;
+	QString m_fileName;
+	QArray<int> m_uids;
+
+	OSQLDriver* m_driver;
+};
+
+#endif
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp
index 1b5af2f..aae7fca 100644
--- a/libopie/pim/ocontactaccessbackend_xml.cpp
+++ b/libopie/pim/ocontactaccessbackend_xml.cpp
@@ -1,817 +1,820 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
- * ToDo: XML-Backend: Automatic reload if something was changed...
- *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.9  2003/09/22 14:31:16  eilers
+ * Added first experimental incarnation of sql-backend for addressbook.
+ * Some modifications to be able to compile the todo sql-backend.
+ * A lot of changes fill follow...
+ *
  * Revision 1.8  2003/08/30 15:28:26  eilers
  * Removed some unimportant debug output which causes slow down..
  *
  * Revision 1.7  2003/08/01 12:30:16  eilers
  * Merging changes from BRANCH_1_0 to HEAD
  *
  * Revision 1.6  2003/07/07 16:19:47  eilers
  * Fixing serious bug in hasQuerySettings()
  *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2003/03/21 14:32:54  mickeyl
  * g++ compliance fix: default arguments belong into the declaration, but not the definition
  *
  * Revision 1.3  2003/03/21 12:26:28  eilers
  * Fixing small bug: If we search a birthday from today to today, it returned
  * every contact ..
  *
  * Revision 1.2  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.1.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.1.2.1  2003/02/10 15:31:38  eilers
  * Writing offsets to debug output..
  *
  * Revision 1.1  2003/02/09 15:05:01  eilers
  * Nothing happened.. Just some cleanup before I will start..
  *
  * Revision 1.12  2003/01/03 16:58:03  eilers
  * Reenable debug output
  *
  * Revision 1.11  2003/01/03 12:31:28  eilers
  * Bugfix for calculating data diffs..
  *
  * Revision 1.10  2003/01/02 14:27:12  eilers
  * Improved query by example: Search by date is possible.. First step
  * for a today plugin for birthdays..
  *
  * Revision 1.9  2002/12/08 12:48:57  eilers
  * Moved journal-enum from ocontact into i the xml-backend..
  *
  * Revision 1.8  2002/11/14 17:04:24  eilers
  * Sorting will now work if fullname is identical on some entries
  *
  * Revision 1.7  2002/11/13 15:02:46  eilers
  * Small Bug in sorted fixed
  *
  * Revision 1.6  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.5  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.4  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.3  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
  * Revision 1.2  2002/10/07 17:34:24  eilers
  * added OBackendFactory for advanced backend access
  *
  * Revision 1.1  2002/09/27 17:11:44  eilers
  * Added API for accessing the Contact-Database ! It is compiling, but
  * please do not expect that anything is working !
  * I will debug that stuff in the next time ..
  * Please read README_COMPILE for compiling !
  *
  *
  */
 
 #include "ocontactaccessbackend_xml.h"
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qregexp.h>
 #include <qarray.h>
 #include <qmap.h>
 #include <qdatetime.h>
 
 #include <qpe/global.h>
 
 #include <opie/xmltree.h>
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #include <stdlib.h>
 #include <errno.h>
 
 using namespace Opie;
 
 
 OContactAccessBackend_XML::OContactAccessBackend_XML ( const QString& appname, const QString& filename ):
 	m_changed( false )
 {
 	// Just m_contactlist should call delete if an entry
 	// is removed.
 	m_contactList.setAutoDelete( true );
 	m_uidToContact.setAutoDelete( false );
 
 	m_appName = appname;
 
 	/* Set journalfile name ... */
 	m_journalName = getenv("HOME");
 	m_journalName +="/.abjournal" + appname;
 
 	/* Expecting to access the default filename if nothing else is set */
 	if ( filename.isEmpty() ){
 		m_fileName = Global::applicationFileName( "addressbook","addressbook.xml" );
 	} else
 		m_fileName = filename;
 
 	/* Load Database now */
 	load ();
 }
 
 bool OContactAccessBackend_XML::save()
 {
 
 	if ( !m_changed )
 		return true;
 
 	QString strNewFile = m_fileName + ".new";
 	QFile f( strNewFile );
 	if ( !f.open( IO_WriteOnly|IO_Raw ) )
 		return false;
 
 	int total_written;
 	int idx_offset = 0;
 	QString out;
 
 	// Write Header
 	out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n"
 		" <Groups>\n"
 		" </Groups>\n"
 		" <Contacts>\n";
 	QCString cstr = out.utf8();
 	f.writeBlock( cstr.data(), cstr.length() );
 	idx_offset += cstr.length();
 	out = "";
 
 	// Write all contacts
 	QListIterator<OContact> it( m_contactList );
 	for ( ; it.current(); ++it ) {
 		// qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset );
 		out += "<Contact ";
 		(*it)->save( out );
 		out += "/>\n";
 		cstr = out.utf8();
 		total_written = f.writeBlock( cstr.data(), cstr.length() );
 		idx_offset += cstr.length();
 		if ( total_written != int(cstr.length()) ) {
 			f.close();
 			QFile::remove( strNewFile );
 			return false;
 		}
 		out = "";
 	}
 	out += " </Contacts>\n</AddressBook>\n";
 
 	// Write Footer
 	cstr = out.utf8();
 	total_written = f.writeBlock( cstr.data(), cstr.length() );
 	if ( total_written != int( cstr.length() ) ) {
 		f.close();
 		QFile::remove( strNewFile );
 		return false;
 	}
 	f.close();
 
 	// move the file over, I'm just going to use the system call
 	// because, I don't feel like using QDir.
 	if ( ::rename( strNewFile.latin1(), m_fileName.latin1() ) < 0 ) {
 		qWarning( "problem renaming file %s to %s, errno: %d",
 			  strNewFile.latin1(), m_journalName.latin1(), errno );
 		// remove the tmp file...
 		QFile::remove( strNewFile );
 	}
 
 	/* The journalfile should be removed now... */
 	removeJournal();
 
 	m_changed = false;
 	return true;
 }
 
 bool OContactAccessBackend_XML::load ()
 {
 	m_contactList.clear();
 	m_uidToContact.clear();
 
 	/* Load XML-File and journal if it exists */
 	if ( !load ( m_fileName, false ) )
 		return false;
 	/* The returncode of the journalfile is ignored due to the
 	 * fact that it does not exist when this class is instantiated !
 	 * But there may such a file exist, if the application crashed.
 	 * Therefore we try to load it to get the changes before the #
 	 * crash happened...
 	 */
 	load (m_journalName, true);
 
 	return true;
 }
 
 void OContactAccessBackend_XML::clear ()
 {
 	m_contactList.clear();
 	m_uidToContact.clear();
 
 	m_changed = false;
 }
 
 bool OContactAccessBackend_XML::wasChangedExternally()
 {
 	QFileInfo fi( m_fileName );
 
 	QDateTime lastmod = fi.lastModified ();
 
 	return (lastmod != m_readtime);
 }
 
 QArray<int> OContactAccessBackend_XML::allRecords() const
 {
 	QArray<int> uid_list( m_contactList.count() );
 
 	uint counter = 0;
 	QListIterator<OContact> it( m_contactList );
 	for( ; it.current(); ++it ){
 		uid_list[counter++] = (*it)->uid();
 	}
 
 	return ( uid_list );
 }
 
 OContact OContactAccessBackend_XML::find ( int uid ) const
 {
 	OContact foundContact; //Create empty contact
 
 	OContact* found = m_uidToContact.find( QString().setNum( uid ) );
 
 	if ( found ){
 		foundContact = *found;
 	}
 
 	return ( foundContact );
 }
 
 QArray<int> OContactAccessBackend_XML::queryByExample ( const OContact &query, int settings,
 							const QDateTime& d )
 {
 
 	QArray<int> m_currentQuery( m_contactList.count() );
 	QListIterator<OContact> 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() );
 			case Qtopia::Anniversary:
 				if ( queryDate == 0l ){
 					queryDate = new QDate( query.anniversary() );
 					checkDate = new QDate( (*it)->anniversary() );
 				}
 
 				if ( queryDate->isValid() ){
 					if(  checkDate->isValid() ){
 						if ( settings & OContactAccess::DateYear ){
 							if ( queryDate->year() != checkDate->year() )
 								allcorrect = false;
 						}
 						if ( settings & OContactAccess::DateMonth ){
 							if ( queryDate->month() != checkDate->month() )
 								allcorrect = false;
 						}
 						if ( settings & OContactAccess::DateDay ){
 							if ( queryDate->day() != checkDate->day() )
 								allcorrect = false;
 						}
 						if ( settings & OContactAccess::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;
 				checkDate = 0l;
 				break;
 			default:
 				/* Just compare fields which are not empty in the query object */
 				if ( !query.field(i).isEmpty() ){
 					switch ( settings & ~( OContactAccess::IgnoreCase
 							       | OContactAccess::DateDiff
 							       | OContactAccess::DateYear
 							       | OContactAccess::DateMonth
 							       | OContactAccess::DateDay
 							       | OContactAccess::MatchOne
 							       ) ){
 
 					case OContactAccess::RegExp:{
 						QRegExp expr ( query.field(i),
 							       !(settings & OContactAccess::IgnoreCase),
 							       false );
 						if ( expr.find ( (*it)->field(i), 0 ) == -1 )
 							allcorrect = false;
 					}
 						break;
 					case OContactAccess::WildCards:{
 						QRegExp expr ( query.field(i),
 							       !(settings & OContactAccess::IgnoreCase),
 							       true );
 						if ( expr.find ( (*it)->field(i), 0 ) == -1 )
 							allcorrect = false;
 					}
 						break;
 					case OContactAccess::ExactMatch:{
 						if (settings & OContactAccess::IgnoreCase){
 							if ( query.field(i).upper() !=
 							     (*it)->field(i).upper() )
 								allcorrect = false;
 						}else{
 							if ( query.field(i) != (*it)->field(i) )
 								allcorrect = false;
 						}
 					}
 						break;
 					}
 				}
 			}
 		}
 		if ( allcorrect ){
 			m_currentQuery[arraycounter++] = (*it)->uid();
 		}
 	}
 
 	// Shrink to fit..
 	m_currentQuery.resize(arraycounter);
 
 	return m_currentQuery;
 }
 
 QArray<int> OContactAccessBackend_XML::matchRegexp(  const QRegExp &r ) const
 {
 	QArray<int> m_currentQuery( m_contactList.count() );
 	QListIterator<OContact> it( m_contactList );
 	uint arraycounter = 0;
 
 	for( ; it.current(); ++it ){
 		if ( (*it)->match( r ) ){
 			m_currentQuery[arraycounter++] = (*it)->uid();
 		}
 
 	}
 	// Shrink to fit..
 	m_currentQuery.resize(arraycounter);
 
 	return m_currentQuery;
 }
 
 const uint OContactAccessBackend_XML::querySettings()
 {
 	return ( OContactAccess::WildCards
 		 | OContactAccess::IgnoreCase
 		 | OContactAccess::RegExp
 		 | OContactAccess::ExactMatch
 		 | OContactAccess::DateDiff
 		 | OContactAccess::DateYear
 		 | OContactAccess::DateMonth
 		 | OContactAccess::DateDay
 		 );
 }
 
 bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 {
 	/* OContactAccess::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 & ( 
 				OContactAccess::IgnoreCase
 				| OContactAccess::WildCards
 				| OContactAccess::DateDiff
 				| OContactAccess::DateYear
 				| OContactAccess::DateMonth
 				| OContactAccess::DateDay
 				| OContactAccess::RegExp
 				| OContactAccess::ExactMatch
 			       ) ) != querySettings )
 		return false;
 
 	// Step 2: Check whether the given combinations are ok..
 
 	// IngoreCase alone is invalid
 	if ( querySettings == OContactAccess::IgnoreCase )
 		return false;
 
 	// WildCards, RegExp and ExactMatch should never used at the same time 
 	switch ( querySettings & ~( OContactAccess::IgnoreCase
 				    | OContactAccess::DateDiff
 				    | OContactAccess::DateYear
 				    | OContactAccess::DateMonth
 				    | OContactAccess::DateDay
 				    )
 		 ){
 	case OContactAccess::RegExp:
 		return ( true );
 	case OContactAccess::WildCards:
 		return ( true );
 	case OContactAccess::ExactMatch:
 		return ( true );
 	case 0: // one of the upper removed bits were set..
 		return ( true );
 	default:
 		return ( false );
 	}
 }
 
 // Currently only asc implemented..
 QArray<int> OContactAccessBackend_XML::sorted( bool asc,  int , int ,  int )
 {
 	QMap<QString, int> nameToUid;
 	QStringList names;
 	QArray<int> m_currentQuery( m_contactList.count() );
 
 	// First fill map and StringList with all Names
 	// Afterwards sort namelist and use map to fill array to return..
 	QListIterator<OContact> it( m_contactList );
 	for( ; it.current(); ++it ){
 		names.append( (*it)->fileAs() + QString::number( (*it)->uid() ) );
 		nameToUid.insert( (*it)->fileAs() + QString::number( (*it)->uid() ), (*it)->uid() );
 	}
 	names.sort();
 
 	int i = 0;
 	if ( asc ){
 		for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
 			m_currentQuery[i++] = nameToUid[ (*it) ];
 	}else{
 		for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
 			m_currentQuery[i++] = nameToUid[ (*it) ];
 	}
 
 	return m_currentQuery;
 
 }
 
 bool OContactAccessBackend_XML::add ( const OContact &newcontact )
 {
 	//qWarning("odefaultbackend: ACTION::ADD");
 	updateJournal (newcontact, ACTION_ADD);
 	addContact_p( newcontact );
 
 	m_changed = true;
 
 	return true;
 }
 
 bool OContactAccessBackend_XML::replace ( const OContact &contact )
 {
 	m_changed = true;
 
 	OContact* found = m_uidToContact.find ( QString().setNum( contact.uid() ) );
 
 	if ( found ) {
 		OContact* newCont = new OContact( contact );
 
 		updateJournal ( *newCont, ACTION_REPLACE);
 		m_contactList.removeRef ( found );
 		m_contactList.append ( newCont );
 		m_uidToContact.remove( QString().setNum( contact.uid() ) );
 		m_uidToContact.insert( QString().setNum( newCont->uid() ), newCont );
 
 		qWarning("Nur zur Sicherheit: %d == %d ?",contact.uid(), newCont->uid());
 
 		return true;
 	} else
 		return false;
 }
 
 bool OContactAccessBackend_XML::remove ( int uid )
 {
 	m_changed = true;
 
 	OContact* found = m_uidToContact.find ( QString().setNum( uid ) );
 
 	if ( found ) {
 		updateJournal ( *found, ACTION_REMOVE);
 		m_contactList.removeRef ( found );
 		m_uidToContact.remove( QString().setNum( uid ) );
 
 		return true;
 	} else
 		return false;
 }
 
 bool OContactAccessBackend_XML::reload(){
 	/* Reload is the same as load in this implementation */
 	return ( load() );
 }
 
 void OContactAccessBackend_XML::addContact_p( const OContact &newcontact )
 {
 	OContact* contRef = new OContact( newcontact );
 
 	m_contactList.append ( contRef );
 	m_uidToContact.insert( QString().setNum( newcontact.uid() ), contRef );
 }
 
 /* This function loads the xml-database and the journalfile */
 bool OContactAccessBackend_XML::load( const QString filename, bool isJournal )
 {
 
 	/* We use the time of the last read to check if the file was
 	 * changed externally.
 	 */
 	if ( !isJournal ){
 		QFileInfo fi( filename );
 		m_readtime = fi.lastModified ();
 	}
 
 	const int JOURNALACTION = Qtopia::Notes + 1;
 	const int JOURNALROW = JOURNALACTION + 1;
 
 	bool foundAction = false;
 	journal_action action = ACTION_ADD;
 	int journalKey = 0;
 	QMap<int, QString> contactMap;
 	QMap<QString, QString> customMap;
 	QMap<QString, QString>::Iterator customIt;
 	QAsciiDict<int> dict( 47 );
 
 	dict.setAutoDelete( TRUE );
 	dict.insert( "Uid", new int(Qtopia::AddressUid) );
 	dict.insert( "Title", new int(Qtopia::Title) );
 	dict.insert( "FirstName", new int(Qtopia::FirstName) );
 	dict.insert( "MiddleName", new int(Qtopia::MiddleName) );
 	dict.insert( "LastName", new int(Qtopia::LastName) );
 	dict.insert( "Suffix", new int(Qtopia::Suffix) );
 	dict.insert( "FileAs", new int(Qtopia::FileAs) );
 	dict.insert( "Categories", new int(Qtopia::AddressCategory) );
 	dict.insert( "DefaultEmail", new int(Qtopia::DefaultEmail) );
 	dict.insert( "Emails", new int(Qtopia::Emails) );
 	dict.insert( "HomeStreet", new int(Qtopia::HomeStreet) );
 	dict.insert( "HomeCity", new int(Qtopia::HomeCity) );
 	dict.insert( "HomeState", new int(Qtopia::HomeState) );
 	dict.insert( "HomeZip", new int(Qtopia::HomeZip) );
 	dict.insert( "HomeCountry", new int(Qtopia::HomeCountry) );
 	dict.insert( "HomePhone", new int(Qtopia::HomePhone) );
 	dict.insert( "HomeFax", new int(Qtopia::HomeFax) );
 	dict.insert( "HomeMobile", new int(Qtopia::HomeMobile) );
 	dict.insert( "HomeWebPage", new int(Qtopia::HomeWebPage) );
 	dict.insert( "Company", new int(Qtopia::Company) );
 	dict.insert( "BusinessStreet", new int(Qtopia::BusinessStreet) );
 	dict.insert( "BusinessCity", new int(Qtopia::BusinessCity) );
 	dict.insert( "BusinessState", new int(Qtopia::BusinessState) );
 	dict.insert( "BusinessZip", new int(Qtopia::BusinessZip) );
 	dict.insert( "BusinessCountry", new int(Qtopia::BusinessCountry) );
 	dict.insert( "BusinessWebPage", new int(Qtopia::BusinessWebPage) );
 	dict.insert( "JobTitle", new int(Qtopia::JobTitle) );
 	dict.insert( "Department", new int(Qtopia::Department) );
 	dict.insert( "Office", new int(Qtopia::Office) );
 	dict.insert( "BusinessPhone", new int(Qtopia::BusinessPhone) );
 	dict.insert( "BusinessFax", new int(Qtopia::BusinessFax) );
 	dict.insert( "BusinessMobile", new int(Qtopia::BusinessMobile) );
 	dict.insert( "BusinessPager", new int(Qtopia::BusinessPager) );
 	dict.insert( "Profession", new int(Qtopia::Profession) );
 	dict.insert( "Assistant", new int(Qtopia::Assistant) );
 	dict.insert( "Manager", new int(Qtopia::Manager) );
 	dict.insert( "Spouse", new int(Qtopia::Spouse) );
 	dict.insert( "Children", new int(Qtopia::Children) );
 	dict.insert( "Gender", new int(Qtopia::Gender) );
 	dict.insert( "Birthday", new int(Qtopia::Birthday) );
 	dict.insert( "Anniversary", new int(Qtopia::Anniversary) );
 	dict.insert( "Nickname", new int(Qtopia::Nickname) );
 	dict.insert( "Notes", new int(Qtopia::Notes) );
 	dict.insert( "action", new int(JOURNALACTION) );
 	dict.insert( "actionrow", new int(JOURNALROW) );
 
 	//qWarning( "OContactDefaultBackEnd::loading %s", filename.latin1() );
 
 	XMLElement *root = XMLElement::load( filename );
 	if(root != 0l ){ // start parsing
 		/* Parse all XML-Elements and put the data into the
 		 * Contact-Class
 		 */
 		XMLElement *element = root->firstChild();
 		//qWarning("OContactAccess::load tagName(): %s", root->tagName().latin1() );
 		element = element->firstChild();
 
 		/* Search Tag "Contacts" which is the parent of all Contacts */
 		while( element && !isJournal ){
 			if( element->tagName() != QString::fromLatin1("Contacts") ){
 				//qWarning ("OContactDefBack::Searching for Tag \"Contacts\"! Found: %s",
 				//	  element->tagName().latin1());
 				element = element->nextChild();
 			} else {
 				element = element->firstChild();
 				break;
 			}
 		}
 		/* Parse all Contacts and ignore unknown tags */
 		while( element ){
 			if( element->tagName() != QString::fromLatin1("Contact") ){
 				//qWarning ("OContactDefBack::Searching for Tag \"Contact\"! Found: %s",
 				//	  element->tagName().latin1());
 				element = element->nextChild();
 				continue;
 			}
 			/* Found alement with tagname "contact", now parse and store all
 			 * attributes contained
 			 */
 			//qWarning("OContactDefBack::load element tagName() : %s",
 			//	 element->tagName().latin1() );
 			QString dummy;
 			foundAction = false;
 
 			XMLElement::AttributeMap aMap = element->attributes();
 			XMLElement::AttributeMap::Iterator it;
 			contactMap.clear();
 			customMap.clear();
 			for( it = aMap.begin(); it != aMap.end(); ++it ){
 				// qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1());
 
 				int *find = dict[ it.key() ];
 				/* Unknown attributes will be stored as "Custom" elements */
 				if ( !find ) {
 					// qWarning("Attribute %s not known.", it.key().latin1());
 					//contact.setCustomField(it.key(), it.data());
 					customMap.insert( it.key(),  it.data() );
 					continue;
 				}
 
 				/* Check if special conversion is needed and add attribute
 				 * into Contact class
 				 */
 				switch( *find ) {
 					/*
 					  case Qtopia::AddressUid:
 					  contact.setUid( it.data().toInt() );
 					  break;
 					  case Qtopia::AddressCategory:
 					  contact.setCategories( Qtopia::Record::idsFromString( it.data( )));
 					  break;
 					*/
 				case JOURNALACTION:
 					action = journal_action(it.data().toInt());
 					foundAction = true;
 					qWarning ("ODefBack(journal)::ACTION found: %d", action);
 					break;
 				case JOURNALROW:
 					journalKey = it.data().toInt();
 					break;
 				default: // no conversion needed add them to the map
 					contactMap.insert( *find, it.data() );
 					break;
 				}
 			}
 			/* now generate the Contact contact */
 			OContact contact( contactMap );
 
 			for (customIt = customMap.begin(); customIt != customMap.end(); ++customIt ) {
 				contact.setCustomField( customIt.key(),  customIt.data() );
 			}
 
 			if (foundAction){
 				foundAction = false;
 				switch ( action ) {
 				case ACTION_ADD:
 					addContact_p (contact);
 					break;
 				case ACTION_REMOVE:
 					if ( !remove (contact.uid()) )
 						qWarning ("ODefBack(journal)::Unable to remove uid: %d",
 							  contact.uid() );
 					break;
 				case ACTION_REPLACE:
 					if ( !replace ( contact ) )
 						qWarning ("ODefBack(journal)::Unable to replace uid: %d",
 							  contact.uid() );
 					break;
 				default:
 					qWarning ("Unknown action: ignored !");
 					break;
 				}
 			}else{
 				/* Add contact to list */
 				addContact_p (contact);
 			}
 
 			/* Move to next element */
 			element = element->nextChild();
 		}
 	}else {
 		qWarning("ODefBack::could not load");
 	}
 	delete root;
 	qWarning("returning from loading" );
 	return true;
 }
 
 
 void OContactAccessBackend_XML::updateJournal( const OContact& cnt,
 					       journal_action action )
 {
 	QFile f( m_journalName );
 	bool created = !f.exists();
 	if ( !f.open(IO_WriteOnly|IO_Append) )
 		return;
 
 	QString buf;
 	QCString str;
 
 	// if the file was created, we have to set the Tag "<CONTACTS>" to
 	// get a XML-File which is readable by our parser.
 	// This is just a cheat, but better than rewrite the parser.
 	if ( created ){
 		buf = "<Contacts>";
 		QCString cstr = buf.utf8();
 		f.writeBlock( cstr.data(), cstr.length() );
 	}
 
 	buf = "<Contact ";
 	cnt.save( buf );
 	buf += " action=\"" + QString::number( (int)action ) + "\" ";
 	buf += "/>\n";
 	QCString cstr = buf.utf8();
 	f.writeBlock( cstr.data(), cstr.length() );
 }
 
 void OContactAccessBackend_XML::removeJournal()
 {
 	QFile f ( m_journalName );
 	if ( f.exists() )
 		f.remove();
 }
 
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index 7b5365b..a0cae4d 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -1,154 +1,160 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
  *	This program is free software; you can redistribute it and/or
  *	modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
+ *       File Locking to protect against concurrent access
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.15  2003/09/22 14:31:16  eilers
+ * Added first experimental incarnation of sql-backend for addressbook.
+ * Some modifications to be able to compile the todo sql-backend.
+ * A lot of changes fill follow...
+ *
  * Revision 1.14  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.13  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.12.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.12.2.1  2003/02/09 15:05:01  eilers
  * Nothing happened.. Just some cleanup before I will start..
  *
  * Revision 1.12  2003/01/03 16:58:03  eilers
  * Reenable debug output
  *
  * Revision 1.11  2003/01/03 12:31:28  eilers
  * Bugfix for calculating data diffs..
  *
  * Revision 1.10  2003/01/02 14:27:12  eilers
  * Improved query by example: Search by date is possible.. First step
  * for a today plugin for birthdays..
  *
  * Revision 1.9  2002/12/08 12:48:57  eilers
  * Moved journal-enum from ocontact into i the xml-backend..
  *
  * Revision 1.8  2002/11/14 17:04:24  eilers
  * Sorting will now work if fullname is identical on some entries
  *
  * Revision 1.7  2002/11/13 15:02:46  eilers
  * Small Bug in sorted fixed
  *
  * Revision 1.6  2002/11/13 14:14:51  eilers
  * Added sorted for Contacts..
  *
  * Revision 1.5  2002/11/01 15:10:42  eilers
  * Added regExp-search in database for all fields in a contact.
  *
  * Revision 1.4  2002/10/16 10:52:40  eilers
  * Added some docu to the interface and now using the cache infrastucture by zecke.. :)
  *
  * Revision 1.3  2002/10/14 16:21:54  eilers
  * Some minor interface updates
  *
  * Revision 1.2  2002/10/07 17:34:24  eilers
  * added OBackendFactory for advanced backend access
  *
  * Revision 1.1  2002/09/27 17:11:44  eilers
  * Added API for accessing the Contact-Database ! It is compiling, but
  * please do not expect that anything is working !
  * I will debug that stuff in the next time ..
  * Please read README_COMPILE for compiling !
  *
  *
  */
 
 #ifndef _OContactAccessBackend_XML_
 #define _OContactAccessBackend_XML_
 
 #include "ocontactaccessbackend.h"
 #include "ocontactaccess.h"
 
 #include <qlist.h>
 #include <qdict.h>
 
 /* the default xml implementation */
 /**
  * This class is the XML implementation of a Contact backend
  * it does implement everything available for OContact.
  * @see OPimAccessBackend for more information of available methods
  */
 class OContactAccessBackend_XML : public OContactAccessBackend {
  public:
 	OContactAccessBackend_XML ( const QString& appname, const QString& filename = QString::null );
 
 	bool save();
 
 	bool load ();
 
 	void clear ();
 
 	bool wasChangedExternally();
 
 	QArray<int> allRecords() const;
 
 	OContact find ( int uid ) const;
 
 	QArray<int> queryByExample ( const OContact &query, int settings, const QDateTime& d = QDateTime() );
 
 	QArray<int> matchRegexp(  const QRegExp &r ) const;
 
 	const uint querySettings();
 
 	bool hasQuerySettings (uint querySettings) const;
 
 	// Currently only asc implemented..
 	QArray<int> sorted( bool asc,  int , int ,  int );
 	bool add ( const OContact &newcontact );
 
 	bool replace ( const OContact &contact );
 
 	bool remove ( int uid );
 	bool reload();
 
  private:
 
 	enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
 
 	void addContact_p( const OContact &newcontact );
 
 	/* This function loads the xml-database and the journalfile */
 	bool load( const QString filename, bool isJournal );
 
 
 	void updateJournal( const OContact& cnt, journal_action action );
 	void removeJournal();
 
  protected:
 	bool m_changed;
 	QString m_journalName;
 	QString m_fileName;
 	QString m_appName;
 	QList<OContact> m_contactList;
 	QDateTime m_readtime;
 
 	QDict<OContact> m_uidToContact;
 };
 
 #endif
diff --git a/libopie/pim/ocontactfields.cpp b/libopie/pim/ocontactfields.cpp
new file mode 100644
index 0000000..831a596
--- a/dev/null
+++ b/libopie/pim/ocontactfields.cpp
@@ -0,0 +1,456 @@
+
+#include "ocontactfields.h"
+
+#include <qstringlist.h>
+#include <qobject.h>
+
+// We should use our own enum in the future ..
+#include <qpe/recordfields.h>
+#include <qpe/config.h>
+#include <opie/ocontact.h>
+
+/*!
+  \internal
+  Returns a  list of details field names for a contact.
+*/
+QStringList OContactFields::untrdetailsfields( bool sorted )
+{
+    QStringList list;
+    QMap<int, QString> mapIdToStr = idToUntrFields();
+
+    list.append( mapIdToStr[ Qtopia::Office ] );
+    list.append( mapIdToStr[ Qtopia::Profession ] );
+    list.append( mapIdToStr[ Qtopia::Assistant ] );
+    list.append( mapIdToStr[ Qtopia::Manager ] );
+
+    list.append( mapIdToStr[ Qtopia::Spouse ] );
+    list.append( mapIdToStr[ Qtopia::Gender ] );
+    list.append( mapIdToStr[ Qtopia::Birthday ] );
+    list.append( mapIdToStr[ Qtopia::Anniversary ] );
+    list.append( mapIdToStr[ Qtopia::Nickname ] );
+    list.append( mapIdToStr[ Qtopia::Children ] );
+
+    if (sorted) list.sort();
+    return list;
+}
+
+/*!
+  \internal
+  Returns a translated list of details field names for a contact.
+*/
+QStringList OContactFields::trdetailsfields( bool sorted )
+{
+    QStringList list;
+    QMap<int, QString> mapIdToStr = idToTrFields();
+
+    list.append( mapIdToStr[Qtopia::Office] );
+    list.append( mapIdToStr[Qtopia::Profession] );
+    list.append( mapIdToStr[Qtopia::Assistant] );
+    list.append( mapIdToStr[Qtopia::Manager] );
+
+    list.append( mapIdToStr[Qtopia::Spouse] );
+    list.append( mapIdToStr[Qtopia::Gender] );
+    list.append( mapIdToStr[Qtopia::Birthday] );
+    list.append( mapIdToStr[Qtopia::Anniversary] );
+    list.append( mapIdToStr[Qtopia::Nickname] );
+    list.append( mapIdToStr[Qtopia::Children] );
+
+    if (sorted) list.sort();
+    return list;
+}
+
+
+/*!
+  \internal
+  Returns a translated list of phone field names for a contact.
+*/
+QStringList OContactFields::trphonefields( bool sorted )
+{
+    QStringList list;
+    QMap<int, QString> mapIdToStr = idToTrFields();
+
+    list.append( mapIdToStr[Qtopia::BusinessPhone] );
+    list.append( mapIdToStr[Qtopia::BusinessFax] );
+    list.append( mapIdToStr[Qtopia::BusinessMobile] ); 
+    list.append( mapIdToStr[Qtopia::BusinessPager] );
+    list.append( mapIdToStr[Qtopia::BusinessWebPage] );
+
+    list.append( mapIdToStr[Qtopia::DefaultEmail] );
+    list.append( mapIdToStr[Qtopia::Emails] );
+
+    list.append( mapIdToStr[Qtopia::HomePhone] );
+    list.append( mapIdToStr[Qtopia::HomeFax] );
+    list.append( mapIdToStr[Qtopia::HomeMobile] );
+    // list.append( mapIdToStr[Qtopia::HomePager] );
+    list.append( mapIdToStr[Qtopia::HomeWebPage] );
+
+    if (sorted) list.sort();
+
+    return list;
+}
+
+
+/*!
+  \internal
+  Returns a list of phone field names for a contact.
+*/
+QStringList OContactFields::untrphonefields( bool sorted )
+{
+    QStringList list;
+    QMap<int, QString> mapIdToStr = idToUntrFields();
+
+    list.append( mapIdToStr[ Qtopia::BusinessPhone ] );
+    list.append( mapIdToStr[ Qtopia::BusinessFax ] );
+    list.append( mapIdToStr[ Qtopia::BusinessMobile ] );
+    list.append( mapIdToStr[ Qtopia::BusinessPager ] );
+    list.append( mapIdToStr[ Qtopia::BusinessWebPage ] );
+
+    list.append( mapIdToStr[ Qtopia::DefaultEmail ] );
+    list.append( mapIdToStr[ Qtopia::Emails ] );
+
+    list.append( mapIdToStr[ Qtopia::HomePhone ] );
+    list.append( mapIdToStr[ Qtopia::HomeFax ] );
+    list.append( mapIdToStr[ Qtopia::HomeMobile ] );
+    //list.append( mapIdToStr[Qtopia::HomePager] );
+    list.append( mapIdToStr[Qtopia::HomeWebPage] );
+
+    if (sorted) list.sort();
+
+    return list;
+}
+
+
+/*!
+  \internal
+  Returns a translated list of field names for a contact.
+*/
+QStringList OContactFields::trfields( bool sorted )
+{
+    QStringList list;
+    QMap<int, QString> mapIdToStr = idToTrFields();
+
+    list.append( mapIdToStr[Qtopia::Title]);
+    list.append( mapIdToStr[Qtopia::FirstName] );
+    list.append( mapIdToStr[Qtopia::MiddleName] );
+    list.append( mapIdToStr[Qtopia::LastName] );
+    list.append( mapIdToStr[Qtopia::Suffix] );
+    list.append( mapIdToStr[Qtopia::FileAs] );
+
+    list.append( mapIdToStr[Qtopia::JobTitle] );
+    list.append( mapIdToStr[Qtopia::Department] );
+    list.append( mapIdToStr[Qtopia::Company] );
+
+    list += trphonefields( sorted );
+
+    list.append( mapIdToStr[Qtopia::BusinessStreet] );
+    list.append( mapIdToStr[Qtopia::BusinessCity] );
+    list.append( mapIdToStr[Qtopia::BusinessState] );
+    list.append( mapIdToStr[Qtopia::BusinessZip] );
+    list.append( mapIdToStr[Qtopia::BusinessCountry] );
+
+    list.append( mapIdToStr[Qtopia::HomeStreet] );
+    list.append( mapIdToStr[Qtopia::HomeCity] );
+    list.append( mapIdToStr[Qtopia::HomeState] );
+    list.append( mapIdToStr[Qtopia::HomeZip] );
+    list.append( mapIdToStr[Qtopia::HomeCountry] );
+
+    list += trdetailsfields( sorted );
+
+    list.append( mapIdToStr[Qtopia::Notes] );
+    list.append( mapIdToStr[Qtopia::Groups] );
+
+    if (sorted) list.sort();
+
+    return list;
+}
+
+/*!
+  \internal
+  Returns an untranslated list of field names for a contact.
+*/
+QStringList OContactFields::untrfields( bool sorted )
+{
+    QStringList list;
+    QMap<int, QString> mapIdToStr = idToUntrFields();
+
+    list.append( mapIdToStr[ Qtopia::Title ] );
+    list.append( mapIdToStr[ Qtopia::FirstName ] );
+    list.append( mapIdToStr[ Qtopia::MiddleName ] );
+    list.append( mapIdToStr[ Qtopia::LastName ] );
+    list.append( mapIdToStr[ Qtopia::Suffix ] );
+    list.append( mapIdToStr[ Qtopia::FileAs ] );
+
+    list.append( mapIdToStr[ Qtopia::JobTitle ] );
+    list.append( mapIdToStr[ Qtopia::Department ] );
+    list.append( mapIdToStr[ Qtopia::Company ] );
+
+    list += untrphonefields( sorted );
+
+    list.append( mapIdToStr[ Qtopia::BusinessStreet ] );
+    list.append( mapIdToStr[ Qtopia::BusinessCity ] );
+    list.append( mapIdToStr[ Qtopia::BusinessState ] );
+    list.append( mapIdToStr[ Qtopia::BusinessZip ] );
+    list.append( mapIdToStr[ Qtopia::BusinessCountry ] );
+
+    list.append( mapIdToStr[ Qtopia::HomeStreet ] );
+    list.append( mapIdToStr[ Qtopia::HomeCity ] );
+    list.append( mapIdToStr[ Qtopia::HomeState ] );
+    list.append( mapIdToStr[ Qtopia::HomeZip ] );
+    list.append( mapIdToStr[ Qtopia::HomeCountry ] );
+
+    list += untrdetailsfields( sorted );
+
+    list.append( mapIdToStr[ Qtopia::Notes ] );
+    list.append( mapIdToStr[ Qtopia::Groups ] );
+
+    if (sorted) list.sort();
+
+    return list;
+}
+QMap<int, QString> OContactFields::idToTrFields()
+{
+	QMap<int, QString> ret_map;
+
+	ret_map.insert( Qtopia::Title, QObject::tr( "Name Title") );
+	ret_map.insert( Qtopia::FirstName, QObject::tr( "First Name" ) );
+	ret_map.insert( Qtopia::MiddleName, QObject::tr( "Middle Name" ) );
+	ret_map.insert( Qtopia::LastName, QObject::tr( "Last Name" ) );
+	ret_map.insert( Qtopia::Suffix,  QObject::tr( "Suffix" ));
+	ret_map.insert( Qtopia::FileAs, QObject::tr( "File As" ) );
+
+	ret_map.insert( Qtopia::JobTitle, QObject::tr( "Job Title" ) );
+	ret_map.insert( Qtopia::Department, QObject::tr( "Department" ) );
+	ret_map.insert( Qtopia::Company, QObject::tr( "Company" ) );
+	ret_map.insert( Qtopia::BusinessPhone, QObject::tr( "Business Phone" ) );
+	ret_map.insert( Qtopia::BusinessFax, QObject::tr( "Business Fax" ) );
+	ret_map.insert( Qtopia::BusinessMobile,  QObject::tr( "Business Mobile" ));
+
+	// email
+	ret_map.insert( Qtopia::DefaultEmail, QObject::tr( "Default Email" ) );
+	ret_map.insert( Qtopia::Emails, QObject::tr( "Emails" ) );
+
+	ret_map.insert( Qtopia::HomePhone, QObject::tr( "Home Phone" ) );
+	ret_map.insert( Qtopia::HomeFax, QObject::tr( "Home Fax" ) );
+	ret_map.insert( Qtopia::HomeMobile, QObject::tr( "Home Mobile" ) );
+
+	// business
+	ret_map.insert( Qtopia::BusinessStreet, QObject::tr( "Business Street" ) );
+	ret_map.insert( Qtopia::BusinessCity, QObject::tr( "Business City" ) );
+	ret_map.insert( Qtopia::BusinessState, QObject::tr( "Business State" ) );
+	ret_map.insert( Qtopia::BusinessZip, QObject::tr( "Business Zip" ) );
+	ret_map.insert( Qtopia::BusinessCountry, QObject::tr( "Business Country" ) );
+	ret_map.insert( Qtopia::BusinessPager, QObject::tr( "Business Pager" ) );
+	ret_map.insert( Qtopia::BusinessWebPage, QObject::tr( "Business WebPage" ) );
+
+	ret_map.insert( Qtopia::Office, QObject::tr( "Office" ) );
+	ret_map.insert( Qtopia::Profession, QObject::tr( "Profession" ) );
+	ret_map.insert( Qtopia::Assistant, QObject::tr( "Assistant" ) );
+	ret_map.insert( Qtopia::Manager, QObject::tr( "Manager" ) );
+
+	// home
+	ret_map.insert( Qtopia::HomeStreet, QObject::tr( "Home Street" ) );
+	ret_map.insert( Qtopia::HomeCity, QObject::tr( "Home City" ) );
+	ret_map.insert( Qtopia::HomeState, QObject::tr( "Home State" ) );
+	ret_map.insert( Qtopia::HomeZip, QObject::tr( "Home Zip" ) );
+	ret_map.insert( Qtopia::HomeCountry, QObject::tr( "Home Country" ) );
+	ret_map.insert( Qtopia::HomeWebPage, QObject::tr( "Home Web Page" ) );
+
+	//personal
+	ret_map.insert( Qtopia::Spouse, QObject::tr( "Spouse" ) );
+	ret_map.insert( Qtopia::Gender, QObject::tr( "Gender" ) );
+	ret_map.insert( Qtopia::Birthday, QObject::tr( "Birthday" ) );
+	ret_map.insert( Qtopia::Anniversary, QObject::tr( "Anniversary" ) );
+	ret_map.insert( Qtopia::Nickname, QObject::tr( "Nickname" ) );
+	ret_map.insert( Qtopia::Children, QObject::tr( "Children" ) );
+
+	// other
+	ret_map.insert( Qtopia::Notes, QObject::tr( "Notes" ) );
+
+
+	return ret_map;
+}
+
+QMap<int, QString> OContactFields::idToUntrFields()
+{
+	QMap<int, QString> ret_map;
+
+	ret_map.insert( Qtopia::Title, "Name Title" );
+	ret_map.insert( Qtopia::FirstName, "First Name" );
+	ret_map.insert( Qtopia::MiddleName, "Middle Name" );
+	ret_map.insert( Qtopia::LastName, "Last Name" );
+	ret_map.insert( Qtopia::Suffix, "Suffix" );
+	ret_map.insert( Qtopia::FileAs, "File As" );
+
+	ret_map.insert( Qtopia::JobTitle, "Job Title" );
+	ret_map.insert( Qtopia::Department, "Department" );
+	ret_map.insert( Qtopia::Company, "Company" );
+	ret_map.insert( Qtopia::BusinessPhone, "Business Phone" );
+	ret_map.insert( Qtopia::BusinessFax, "Business Fax" );
+	ret_map.insert( Qtopia::BusinessMobile, "Business Mobile" );
+
+	// email
+	ret_map.insert( Qtopia::DefaultEmail, "Default Email" );
+	ret_map.insert( Qtopia::Emails, "Emails" );
+
+	ret_map.insert( Qtopia::HomePhone, "Home Phone" );
+	ret_map.insert( Qtopia::HomeFax, "Home Fax" );
+	ret_map.insert( Qtopia::HomeMobile, "Home Mobile" );
+
+	// business
+	ret_map.insert( Qtopia::BusinessStreet, "Business Street" );
+	ret_map.insert( Qtopia::BusinessCity, "Business City" );
+	ret_map.insert( Qtopia::BusinessState, "Business State" );
+	ret_map.insert( Qtopia::BusinessZip, "Business Zip" );
+	ret_map.insert( Qtopia::BusinessCountry, "Business Country" );
+	ret_map.insert( Qtopia::BusinessPager, "Business Pager" );
+	ret_map.insert( Qtopia::BusinessWebPage, "Business WebPage" );
+
+	ret_map.insert( Qtopia::Office, "Office" );
+	ret_map.insert( Qtopia::Profession, "Profession" );
+	ret_map.insert( Qtopia::Assistant, "Assistant" );
+	ret_map.insert( Qtopia::Manager, "Manager" );
+
+	// home
+	ret_map.insert( Qtopia::HomeStreet, "Home Street" );
+	ret_map.insert( Qtopia::HomeCity, "Home City" );
+	ret_map.insert( Qtopia::HomeState, "Home State" );
+	ret_map.insert( Qtopia::HomeZip, "Home Zip" );
+	ret_map.insert( Qtopia::HomeCountry, "Home Country" );
+	ret_map.insert( Qtopia::HomeWebPage, "Home Web Page" );
+
+	//personal
+	ret_map.insert( Qtopia::Spouse, "Spouse" );
+	ret_map.insert( Qtopia::Gender, "Gender" );
+	ret_map.insert( Qtopia::Birthday, "Birthday" );
+	ret_map.insert( Qtopia::Anniversary, "Anniversary" );
+	ret_map.insert( Qtopia::Nickname, "Nickname" );
+	ret_map.insert( Qtopia::Children, "Children" );
+
+	// other
+	ret_map.insert( Qtopia::Notes, "Notes" );
+
+
+	return ret_map;
+}
+
+QMap<QString, int> OContactFields::trFieldsToId()
+{
+	QMap<int, QString> idtostr = idToTrFields();
+	QMap<QString, int> ret_map;
+
+
+        QMap<int, QString>::Iterator it;
+        for( it = idtostr.begin(); it != idtostr.end(); ++it )
+		ret_map.insert( *it, it.key() );
+
+
+	return ret_map;
+}
+
+QMap<QString, int> OContactFields::untrFieldsToId()
+{
+	QMap<int, QString> idtostr = idToUntrFields();
+	QMap<QString, int> ret_map;
+
+
+        QMap<int, QString>::Iterator it;
+        for( it = idtostr.begin(); it != idtostr.end(); ++it )
+		ret_map.insert( *it, it.key() );
+
+
+	return ret_map;
+}
+
+
+OContactFields::OContactFields():
+	fieldOrder( DEFAULT_FIELD_ORDER ),
+	changedFieldOrder( false )
+{
+	// Get the global field order from the config file and
+	// use it as a start pattern
+	Config cfg ( "AddressBook" );
+	cfg.setGroup( "ContactFieldOrder" );
+	globalFieldOrder = cfg.readEntry( "General", DEFAULT_FIELD_ORDER );
+}
+
+OContactFields::~OContactFields(){
+
+	// We will store the fieldorder into the config file
+	// to reuse it for the future.. 
+	if ( changedFieldOrder ){
+		Config cfg ( "AddressBook" );
+		cfg.setGroup( "ContactFieldOrder" );
+		cfg.writeEntry( "General", globalFieldOrder );
+	}
+}
+
+
+
+void OContactFields::saveToRecord( OContact &cnt ){
+
+	qDebug("ocontactfields saveToRecord: >%s<",fieldOrder.latin1());
+
+	// Store fieldorder into this contact.
+	cnt.setCustomField( CONTACT_FIELD_ORDER_NAME, fieldOrder );
+
+	globalFieldOrder = fieldOrder;
+	changedFieldOrder = true;
+
+}
+
+void OContactFields::loadFromRecord( const OContact &cnt ){
+	qDebug("ocontactfields loadFromRecord");
+	qDebug("loading >%s<",cnt.fullName().latin1());
+
+	// Get fieldorder for this contact. If none is defined,
+	// we will use the global one from the config file..
+
+	fieldOrder = cnt.customField( CONTACT_FIELD_ORDER_NAME );
+
+	qDebug("fieldOrder from contact>%s<",fieldOrder.latin1());
+
+	if (fieldOrder.isEmpty()){
+		fieldOrder = globalFieldOrder;
+	}
+
+
+	qDebug("effective fieldOrder in loadFromRecord >%s<",fieldOrder.latin1());
+}
+
+void OContactFields::setFieldOrder( int num, int index ){
+	qDebug("qcontactfields setfieldorder pos %i -> %i",num,index);
+
+	fieldOrder[num] = QString::number( index, 16 )[0];
+
+	// We will store this new fieldorder globally to 
+	// remember it for contacts which have none
+	globalFieldOrder = fieldOrder;
+	changedFieldOrder = true;
+
+	qDebug("fieldOrder >%s<",fieldOrder.latin1());
+}
+
+int OContactFields::getFieldOrder( int num, int defIndex ){
+	qDebug("ocontactfields getFieldOrder");
+	qDebug("fieldOrder >%s<",fieldOrder.latin1());
+
+	// Get index of combo as char..
+	QChar poschar = fieldOrder[num];
+
+	bool ok;
+	int ret = 0;
+	// Convert char to number..
+	if ( !( poschar == QChar::null ) )
+		ret = QString( poschar ).toInt(&ok, 16);
+	else
+		ok = false;
+
+	// Return default value if index for
+	// num was not set or if anything else happened..
+	if ( !ok ) ret = defIndex;
+
+	qDebug("returning >%i<",ret);
+
+	return ret;
+
+}
diff --git a/libopie/pim/ocontactfields.h b/libopie/pim/ocontactfields.h
new file mode 100644
index 0000000..9f6171b
--- a/dev/null
+++ b/libopie/pim/ocontactfields.h
@@ -0,0 +1,60 @@
+#ifndef OPIE_CONTACTS_FIELDS
+#define OPIE_CONTACTS_FIELDS
+
+class QStringList;
+
+#include <qmap.h>
+#include <qstring.h>
+#include <opie/ocontact.h>
+
+#define CONTACT_FIELD_ORDER_NAME "opie-contactfield-order"
+#define DEFAULT_FIELD_ORDER "__________"
+ 
+class OContactFields{
+
+ public:
+    OContactFields();
+    ~OContactFields();
+    /** Set the index for combo boxes.
+     *  Sets the <b>index</b> of combo <b>num</b>.
+     *  @param num selects the number of the combo
+     *  @param index sets the index in the combo
+     */
+    void setFieldOrder( int num, int index );
+
+    /** Get the index for combo boxes.
+     * Returns the index of combo <b>num</b> or defindex
+     * if none was defined..
+     * @param num Selects the number of the combo
+     * @param defIndex will be returned if none was defined (either 
+     * globally in the config file, nor by the contact which was used 
+     * by loadFromRecord() )
+     */
+    int getFieldOrder( int num, int defIndex);
+
+    /** Store fieldorder to contact. */
+    void saveToRecord( OContact& );
+    /** Get Fieldorder from contact. */
+    void loadFromRecord( const OContact& );
+
+ private:
+    QString fieldOrder;
+    QString globalFieldOrder;
+    bool changedFieldOrder;
+
+ public:
+    static QStringList trphonefields( bool sorted = true );
+    static QStringList untrphonefields( bool sorted = true );
+    static QStringList trdetailsfields( bool sorted = true );
+    static QStringList untrdetailsfields( bool sorted = true );
+    static QStringList trfields( bool sorted = true );
+    static QStringList untrfields( bool sorted = true );
+
+    static QMap<int, QString> idToTrFields();
+    static QMap<QString, int> trFieldsToId();
+    static QMap<int, QString> idToUntrFields();
+    static QMap<QString, int> untrFieldsToId();
+
+};
+
+#endif
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp
index ec9c14c..23e0c3e 100644
--- a/libopie/pim/otodoaccesssql.cpp
+++ b/libopie/pim/otodoaccesssql.cpp
@@ -1,540 +1,593 @@
 
 #include <qdatetime.h>
 
 #include <qpe/global.h>
 
-#include <opie/osqldriver.h>
-#include <opie/osqlresult.h>
-#include <opie/osqlmanager.h>
-#include <opie/osqlquery.h>
+#include <opie2/osqldriver.h>
+#include <opie2/osqlresult.h>
+#include <opie2/osqlmanager.h>
+#include <opie2/osqlquery.h>
 
 #include "otodoaccesssql.h"
 
 /*
  * first some query
  * CREATE query
  * LOAD query
  * INSERT
  * REMOVE
  * CLEAR
  */
 namespace {
     /**
      * CreateQuery for the Todolist Table
      */
     class CreateQuery : public OSQLQuery {
     public:
         CreateQuery();
         ~CreateQuery();
         QString query()const;
     };
 
     /**
      * LoadQuery
      * this one queries for all uids
      */
     class LoadQuery : public OSQLQuery {
     public:
         LoadQuery();
         ~LoadQuery();
         QString query()const;
     };
 
     /**
      * inserts/adds a OTodo to the table
      */
     class InsertQuery : public OSQLQuery {
     public:
         InsertQuery(const OTodo& );
         ~InsertQuery();
         QString query()const;
     private:
         OTodo m_todo;
     };
 
     /**
      * removes one from the table
      */
     class RemoveQuery : public OSQLQuery {
     public:
         RemoveQuery(int uid );
         ~RemoveQuery();
         QString query()const;
     private:
         int m_uid;
     };
 
     /**
      * Clears (delete) a Table
      */
     class ClearQuery : public OSQLQuery {
     public:
         ClearQuery();
         ~ClearQuery();
         QString query()const;
 
     };
 
     /**
      * a find query
      */
     class FindQuery : public OSQLQuery {
     public:
         FindQuery(int uid);
         FindQuery(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;
     };
 
 
     CreateQuery::CreateQuery() : OSQLQuery() {}
     CreateQuery::~CreateQuery() {}
     QString CreateQuery::query()const {
         QString qu;
         qu += "create table todolist( uid, categories, completed, progress, ";
         qu += "summary, DueDate, priority, description )";
         return qu;
     }
 
     LoadQuery::LoadQuery() : OSQLQuery() {}
     LoadQuery::~LoadQuery() {}
     QString LoadQuery::query()const {
         QString qu;
         qu += "select distinct uid from todolist";
 
         return qu;
     }
 
     InsertQuery::InsertQuery( const OTodo& todo )
         : OSQLQuery(), m_todo( todo ) {
     }
     InsertQuery::~InsertQuery() {
     }
     /*
      * converts from a OTodo to a query
      * we leave out X-Ref + Alarms
      */
     QString InsertQuery::query()const{
 
         int year, month, day;
         year = month = day = 0;
         if (m_todo.hasDueDate() ) {
             QDate date = m_todo.dueDate();
             year = date.year();
             month = date.month();
             day = date.day();
         }
         QString qu;
         qu  = "insert into todolist VALUES(" +  QString::number( m_todo.uid() ) + ",'" + m_todo.idsToString( m_todo.categories() ) + "',";
         qu += QString::number( m_todo.isCompleted() ) + "," + QString::number( m_todo.progress() ) + ",";
         qu += "'"+m_todo.summary()+"','"+QString::number(year)+"-"+QString::number(month)+"-"+QString::number(day)+"',";
         qu += QString::number(m_todo.priority() ) +",'" + m_todo.description() + "')";
 
         qWarning("add %s", qu.latin1() );
         return qu;
     }
 
     RemoveQuery::RemoveQuery(int uid )
         : OSQLQuery(), m_uid( uid ) {}
     RemoveQuery::~RemoveQuery() {}
     QString RemoveQuery::query()const {
         QString qu = "DELETE from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
 
 
     ClearQuery::ClearQuery()
         : OSQLQuery() {}
     ClearQuery::~ClearQuery() {}
     QString ClearQuery::query()const {
         QString qu = "drop table todolist";
         return qu;
     }
     FindQuery::FindQuery(int uid)
         : OSQLQuery(), m_uid(uid ) {
     }
     FindQuery::FindQuery(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 uid, categories, completed, progress, summary, ";
         qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid);
         return qu;
     }
     QString FindQuery::multi()const {
         QString qu = "select uid, categories, completed, progress, summary, ";
         qu += "DueDate, priority, description 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() );
 
         return str;
     }
 
 
     EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc )
         : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {}
     EffQuery::~EffQuery() {}
     QString EffQuery::query()const {
         return m_inc ? with() : out();
     }
     QString EffQuery::with()const {
         QString str;
         str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ")
             .arg( m_start.year() ).arg( m_start.month() ).arg( m_start.day() )
             .arg( m_end  .year() ).arg( m_end  .month() ).arg( m_end  .day() );
         return str;
     }
     QString EffQuery::out()const {
         QString str;
         str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND  DueDate <= '%4-%5-%6'")
             .arg(m_start.year() ).arg(m_start.month() ).arg( m_start.day() )
             .arg(m_end.  year() ).arg(m_end.  month() ).arg(m_end.day() );
 
         return str;
     }
 };
 
 OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file )
     : OTodoAccessBackend(), m_dict(15), 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();
+    // fillDict();
 }
 
 OTodoAccessBackendSQL::~OTodoAccessBackendSQL(){
 }
 bool OTodoAccessBackendSQL::load(){
     if (!m_driver->open() )
         return false;
 
     CreateQuery creat;
     OSQLResult res = m_driver->query(&creat );
 
     m_dirty = true;
     return true;
 }
 bool OTodoAccessBackendSQL::reload(){
     return load();
 }
 
 bool OTodoAccessBackendSQL::save(){
     return m_driver->close();
 }
 QArray<int> OTodoAccessBackendSQL::allRecords()const {
     if (m_dirty )
         update();
 
     return m_uids;
 }
 QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int, const QDateTime& ){
     QArray<int> ints(0);
     return ints;
 }
 OTodo OTodoAccessBackendSQL::find(int uid ) const{
     FindQuery query( uid );
     return todo( m_driver->query(&query) );
 
 }
 OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints,
                                    uint cur, Frontend::CacheDirection dir ) const{
     int CACHE = readAhead();
     qWarning("searching for %d", uid );
     QArray<int> search( CACHE );
     uint size =0;
     OTodo to;
 
     // we try to cache CACHE items
     switch( dir ) {
         /* forward */
-    case 0:
+    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] );
             search[size] = ints[i];
             size++;
         }
         break;
         /* reverse */
-    case 1:
+    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 OTodoAccessBackendSQL::clear() {
     ClearQuery cle;
     OSQLResult res = m_driver->query( &cle );
     CreateQuery qu;
     res = m_driver->query(&qu);
 }
 bool OTodoAccessBackendSQL::add( const OTodo& t) {
     InsertQuery ins( t );
     OSQLResult res = m_driver->query( &ins );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
     int c = m_uids.count();
     m_uids.resize( c+1 );
     m_uids[c] = t.uid();
 
     return true;
 }
 bool OTodoAccessBackendSQL::remove( int uid ) {
     RemoveQuery rem( uid );
     OSQLResult res = m_driver->query(&rem );
 
     if ( res.state() == OSQLResult::Failure )
         return false;
 
     m_dirty = true;
     return true;
 }
 /*
  * FIXME better set query
  * but we need the cache for that
  * now we remove
  */
 bool OTodoAccessBackendSQL::replace( const OTodo& t) {
     remove( t.uid() );
     bool b= add(t);
     m_dirty = false; // we changed some stuff but the UID stayed the same
     return b;
 }
 QArray<int> OTodoAccessBackendSQL::overDue() {
     OverDueQuery qu;
     return uids( m_driver->query(&qu ) );
 }
 QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
                                                    const QDate& t,
                                                    bool u) {
     EffQuery ef(s, t, u );
     return uids (m_driver->query(&ef) );
 }
 /*
  *
  */
 QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
                                            int sortFilter, int cat ) {
     qWarning("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() );
         query += " " + base + " AND";
     }
     /* not show completed */
     if ( sortFilter & 4 ) {
         query += " completed = 0 AND";
     }else{
        query += " ( completed = 1 OR  completed = 0) AND";
     }
     /* srtip 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!");
         query += " DESC";
     }
 
     qWarning( query );
     OSQLRawQuery raw(query );
     return uids( m_driver->query(&raw) );
 }
 bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{
     if ( str == "0-0-0" )
         return false;
     else{
         int day, year, month;
         QStringList list = QStringList::split("-", str );
         year = list[0].toInt();
         month = list[1].toInt();
         day = list[2].toInt();
         da.setYMD( year, month, day );
         return true;
     }
 }
 OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{
     if ( res.state() == OSQLResult::Failure ) {
         OTodo to;
         return to;
     }
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it = list.begin();
     qWarning("todo1");
     OTodo to = todo( (*it) );
     cache( to );
     ++it;
 
     for ( ; it != list.end(); ++it ) {
         qWarning("caching");
         cache( todo( (*it) ) );
     }
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     qWarning("todo");
     bool has = false; QDate da = QDate::currentDate();
     has = date( da, item.data("DueDate") );
     QStringList cats = QStringList::split(";", item.data("categories") );
 
     OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
               cats, item.data("summary"), item.data("description"),
               item.data("progress").toUShort(), has, da,
               item.data("uid").toInt() );
     return to;
 }
 OTodo OTodoAccessBackendSQL::todo( int uid )const {
     FindQuery find( uid );
     return todo( m_driver->query(&find) );
 }
 /*
  * update the dict
  */
 void OTodoAccessBackendSQL::fillDict() {
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
+     * FIXME: Isn't this dict obsolete ? (eilers)
      */
     m_dict.setAutoDelete( TRUE );
     m_dict.insert("Categories" ,     new int(OTodo::Category)         );
     m_dict.insert("Uid" ,            new int(OTodo::Uid)              );
     m_dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     m_dict.insert("Completed" ,      new int(OTodo::Completed)        );
     m_dict.insert("Description" ,    new int(OTodo::Description)      );
     m_dict.insert("Summary" ,        new int(OTodo::Summary)          );
     m_dict.insert("Priority" ,       new int(OTodo::Priority)         );
     m_dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     m_dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     m_dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     m_dict.insert("Progress" ,       new int(OTodo::Progress)         );
-    m_dict.insert("Completed",       new int(OTodo::Completed)        );
+    m_dict.insert("Completed",       new int(OTodo::Completed)        ); // Why twice ? (eilers)
     m_dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
-    m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) );
-    m_dict.insert("AlarmDateTime",   new int(OTodo::AlarmDateTime)    );
+//    m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); // old stuff (eilers)
+//    m_dict.insert("AlarmDateTime",   new int(OTodo::AlarmDateTime)    ); // old stuff (eilers)
 }
 /*
  * need to be const so let's fool the
  * compiler :(
  */
 void OTodoAccessBackendSQL::update()const {
     ((OTodoAccessBackendSQL*)this)->m_dirty = false;
     LoadQuery lo;
     OSQLResult res = m_driver->query(&lo);
     if ( res.state() != OSQLResult::Success )
         return;
 
     ((OTodoAccessBackendSQL*)this)->m_uids = uids( res );
 }
 QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
 
     OSQLResultItem::ValueList list = res.results();
     OSQLResultItem::ValueList::Iterator it;
     QArray<int> ints(list.count() );
     qWarning(" 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> OTodoAccessBackendSQL::matchRegexp(  const QRegExp &r ) const
+{
+
+#warning OTodoAccessBackendSQL::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, OTodo>::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 OTodoAccessBackendSQL::supports()const {
+
+	static QBitArray ar = sup();
+	return ar;
+}
+
+QBitArray OTodoAccessBackendSQL::sup() {
+
+	QBitArray ar( OTodo::CompletedDate + 1 );
+	ar.fill( true );
+	ar[OTodo::CrossReference] = false;
+	ar[OTodo::State ] = false;
+	ar[OTodo::Reminders] = false;
+	ar[OTodo::Notifiers] = false;
+	ar[OTodo::Maintainer] = false;
+	
+	return ar;
+}
+
+void OTodoAccessBackendSQL::removeAllCompleted(){
+#warning OTodoAccessBackendSQL::removeAllCompleted() not implemented !!
+
+}
diff --git a/libopie/pim/otodoaccesssql.h b/libopie/pim/otodoaccesssql.h
index 6a4257c..77d8b77 100644
--- a/libopie/pim/otodoaccesssql.h
+++ b/libopie/pim/otodoaccesssql.h
@@ -1,50 +1,56 @@
 #ifndef OPIE_PIM_ACCESS_SQL_H
 #define OPIE_PIM_ACCESS_SQL_H
 
 #include <qasciidict.h>
 
 #include "otodoaccessbackend.h"
 
 class OSQLDriver;
 class OSQLResult;
 class OSQLResultItem;
 class OTodoAccessBackendSQL : public OTodoAccessBackend {
 public:
     OTodoAccessBackendSQL( const QString& file );
     ~OTodoAccessBackendSQL();
 
     bool load();
     bool reload();
     bool save();
     QArray<int> allRecords()const;
 
     QArray<int> queryByExample( const OTodo& t, int settings, const QDateTime& d = QDateTime() );
     OTodo find(int uid)const;
     OTodo find(int uid, const QArray<int>&, uint cur, Frontend::CacheDirection )const;
     void clear();
     bool add( const OTodo& t );
     bool remove( int uid );
     bool replace( const OTodo& t );
 
     QArray<int> overDue();
     QArray<int> effectiveToDos( const QDate& start,
                                 const QDate& end, bool includeNoDates );
     QArray<int> sorted(bool asc, int sortOrder, int sortFilter, int cat );
 
+    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 OTodo todo( const OSQLResult& )const;
     inline OTodo todo( OSQLResultItem& )const;
     inline QArray<int> uids( const OSQLResult& )const;
     OTodo todo( int uid )const;
+    QBitArray sup();
 
     QAsciiDict<int> m_dict;
     OSQLDriver* m_driver;
     QArray<int> m_uids;
     bool m_dirty : 1;
 };
 
 
 #endif
diff --git a/libopie/pim/test/converter.cpp b/libopie/pim/test/converter.cpp
new file mode 100644
index 0000000..0a488f2
--- a/dev/null
+++ b/libopie/pim/test/converter.cpp
@@ -0,0 +1,64 @@
+#include <qpe/qpeapplication.h>
+
+#include <opie/ocontactaccess.h>
+#include <opie/ocontactaccessbackend_xml.h>
+#include <opie/ocontactaccessbackend_sql.h>
+
+#include "converter_base.h"
+
+class ConvertXMLToSQL: public converter_base {
+public:
+	ConvertXMLToSQL()
+	{
+		convertContact();
+	}
+private:
+	void convertContact();
+
+};
+
+
+void ConvertXMLToSQL::convertContact(){
+	qWarning("Converting Contacts from XML to SQL..");
+	
+	// Creating backends to the requested databases..
+	OContactAccessBackend* xmlBackend = new OContactAccessBackend_XML( "Converter", 
+									   QString::null );
+	
+	OContactAccessBackend* sqlBackend = new OContactAccessBackend_SQL( QString::null,
+									   QString::null );
+	// Put the created backends into frontends to access them
+	OContactAccess* xmlAccess = new OContactAccess ( "addressbook_xml", 
+							 QString::null , xmlBackend, true );
+	
+	OContactAccess* sqlAccess = new OContactAccess ( "addressbook_sql", 
+							 QString::null , sqlBackend, true );
+	
+	// Clean the sql-database..
+	sqlAccess->clear();
+	
+	// Now trasmit every contact from the xml database to the sql-database
+	OContactAccess::List contactList = xmlAccess->allRecords();
+	if ( sqlAccess && xmlAccess ){
+		OContactAccess::List::Iterator it;
+		for ( it = contactList.begin(); it != contactList.end(); ++it )
+			sqlAccess->add( *it );
+	}
+	
+	// Delete the frontends. Backends will be deleted automatically, too !
+	delete sqlAccess;
+	delete xmlAccess;
+}
+
+int main( int argc, char** argv ) {
+
+	QPEApplication a( argc, argv );
+
+	ConvertXMLToSQL dlg;
+
+	a.showMainWidget( &dlg );
+	// dlg. showMaximized ( );
+
+	return a.exec();
+
+}
diff --git a/libopie/pim/test/converter.pro b/libopie/pim/test/converter.pro
new file mode 100644
index 0000000..aa74bff
--- a/dev/null
+++ b/libopie/pim/test/converter.pro
@@ -0,0 +1,12 @@
+TEMPLATE	= app
+CONFIG		= qt warn_on debug
+# CONFIG		= qt warn_on release
+#HEADERS		=
+SOURCES		=  converter.cpp
+INTERFACES      =  converter_base.ui
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
+LIBS            += -lqpe -lopie 
+TARGET		= converter
+
+include ( $(OPIEDIR)/include.pro )
diff --git a/libopie/pim/test/converter_base.ui b/libopie/pim/test/converter_base.ui
new file mode 100644
index 0000000..f680550
--- a/dev/null
+++ b/libopie/pim/test/converter_base.ui
@@ -0,0 +1,43 @@
+<!DOCTYPE UI><UI>
+<class>converter_base</class>
+<widget>
+    <class>QDialog</class>
+    <property stdset="1">
+        <name>name</name>
+        <cstring>converter_base</cstring>
+    </property>
+    <property stdset="1">
+        <name>geometry</name>
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>579</width>
+            <height>211</height>
+        </rect>
+    </property>
+    <property stdset="1">
+        <name>caption</name>
+        <string>Form2</string>
+    </property>
+    <widget>
+        <class>QLabel</class>
+        <property stdset="1">
+            <name>name</name>
+            <cstring>TextLabel1</cstring>
+        </property>
+        <property stdset="1">
+            <name>geometry</name>
+            <rect>
+                <x>340</x>
+                <y>40</y>
+                <width>210</width>
+                <height>20</height>
+            </rect>
+        </property>
+        <property stdset="1">
+            <name>text</name>
+            <string>Converter from XML-&gt;SQL</string>
+        </property>
+    </widget>
+</widget>
+</UI>