Some modifications to alow use of generic OPimRecords without need to

cast them manually to the right type

9 files changed, 65 insertions, 15 deletions

diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 401a3c1..14207be 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -1,851 +1,852 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * SQL Backend for the OPIE-Contact Database.
  */
 
 #include "ocontactaccessbackend_sql.h"
 
 #include <qarray.h>
 #include <qdatetime.h>
 #include <qstringlist.h>
 
 #include <qpe/global.h>
 #include <qpe/recordfields.h>
 
 #include <opie2/opimcontact.h>
 #include <opie2/opimcontactfields.h>
 #include <opie2/opimdateconversion.h>
 #include <opie2/osqldriver.h>
 #include <opie2/osqlresult.h>
 #include <opie2/osqlmanager.h>
 #include <opie2/osqlquery.h>
 
 using namespace Opie;
 using namespace Opie::DB;
 
 
 /*
  * Implementation of used query types * CREATE query
  * 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 OPimContact to the table
 	 */
 	class InsertQuery : public OSQLQuery {
 	public:
 		InsertQuery(const OPimContact& );
 		~InsertQuery();
 		QString query()const;
 	private:
 		OPimContact m_contact;
 	};
 	
 
 	/**
 	 * removes one from the table
 	 */
 	class RemoveQuery : public OSQLQuery {
 	public:
 		RemoveQuery(int uid );
 		~RemoveQuery();
 		QString query()const;
 	private:
 		int m_uid;
 	};
 	
 	/**
 	 * a find query for noncustom elements
 	 */
 	class FindQuery : public OSQLQuery {
 	public:
 		FindQuery(int uid);
 		FindQuery(const QArray<int>& );
 		~FindQuery();
 		QString query()const;
 	private:
 		QString single()const;
 		QString multi()const;
 		QArray<int> m_uids;
 		int m_uid;
 	};
 
 	/**
 	 * a find query for custom elements
 	 */
 	class FindCustomQuery : public OSQLQuery {
 	public:
 		FindCustomQuery(int uid);
 		FindCustomQuery(const QArray<int>& );
 		~FindCustomQuery();
 		QString query()const;
 	private:
 		QString single()const;
 		QString multi()const;
 		QArray<int> m_uids;
 		int m_uid;
 	};
 	
 
 
 	// We using two tables to store the information:
 	// 1. addressbook  : It contains General information about the contact (non custom)
 	// 2. custom_data  : Not official supported entries
 	// All tables are connected by the uid of the contact.
 	// Maybe I should add a table for meta-information ? 
 	CreateQuery::CreateQuery() : OSQLQuery() {}
 	CreateQuery::~CreateQuery() {}
 	QString CreateQuery::query()const {
 		QString qu;
 
 		qu += "create table addressbook( uid PRIMARY KEY ";
 
 		QStringList fieldList = OPimContactFields::untrfields( false );
 		for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
 			qu += QString( ",\"%1\" VARCHAR(10)" ).arg( *it );
 		}
 		qu += " );";
 		
 		qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), priority INTEGER, value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
 
 		return qu;
 	}
 	
 	ClearQuery::ClearQuery()
 		: OSQLQuery() {}
 	ClearQuery::~ClearQuery() {}
 	QString ClearQuery::query()const {
 		QString qu = "drop table addressbook;";
 		qu += "drop table custom_data;";
 // 		qu += "drop table dates;";
 		return qu;
 	}
 
 
 	LoadQuery::LoadQuery() : OSQLQuery() {}
 	LoadQuery::~LoadQuery() {}
 	QString LoadQuery::query()const {
 		QString qu;
 		qu += "select uid from addressbook";
 		
 		return qu;
 	}
 	
 
 	InsertQuery::InsertQuery( const OPimContact& contact )
 		: OSQLQuery(), m_contact( contact ) {
 	}
 
 	InsertQuery::~InsertQuery() {
 	}
 
 	/*
 	 * converts from a OPimContact to a query
 	 */
 	QString InsertQuery::query()const{
 
 		QString qu;
 		qu  += "insert into addressbook VALUES( " + 
 			QString::number( m_contact.uid() );
 
 		// Get all information out of the contact-class
 		// Remember: The category is stored in contactMap, too ! 
 		QMap<int, QString> contactMap = m_contact.toMap();
 		
 		QStringList fieldList = OPimContactFields::untrfields( false );
 		QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
 		for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
 			// Convert Column-String to Id and get value for this id..
 			// Hmmm.. Maybe not very cute solution..
 			int id = translate[*it];
 			switch ( id ){
 			case Qtopia::Birthday:
 			case Qtopia::Anniversary:{
 				QDate day;
 				if ( id == Qtopia::Birthday ){
 					day = m_contact.birthday();
 				} else {
 					day = m_contact.anniversary();
 				}
 				// These entries should stored in a special format
 				// year-month-day
 				if ( day.isValid() ){
 					qu += QString(",\"%1-%2-%3\"")
 						.arg( QString::number( day.year() ).rightJustify( 4, '0' ) )
 						.arg( QString::number( day.month() ).rightJustify( 2, '0' ) )
 						.arg( QString::number( day.day() ).rightJustify( 2, '0' ) );
 				} else {
 					qu += ",\"\"";
 				}
 			}
 				break;
 			default:
 				qu += QString( ",\"%1\"" ).arg( contactMap[id] );
 			}
 		}
 		qu += " );";
 
 			
 		// Now add custom data..
 		int id = 0;
 		id = 0;
 		QMap<QString, QString> customMap = m_contact.toExtraMap();
 		for( QMap<QString, QString>::Iterator it = customMap.begin(); 
 		     it != customMap.end(); ++it ){
 			qu  += "insert into custom_data VALUES(" 
 				+  QString::number( m_contact.uid() )
 				+ ","
 				+  QString::number( id++ ) 
 				+ ",'" 
 				+ it.key()
 				+ "',"
 				+ "0" // Priority for future enhancements
 				+ ",'" 
 				+ it.data()
 				+ "');";
 		}		
 		// qu  += "commit;";
 		qDebug("add %s", qu.latin1() );
 		return qu;
 	}
 	
 
 	RemoveQuery::RemoveQuery(int uid )
 		: OSQLQuery(), m_uid( uid ) {}
 	RemoveQuery::~RemoveQuery() {}
 	QString RemoveQuery::query()const {
 		QString qu = "DELETE from addressbook where uid = " 
 			+ QString::number(m_uid) + ";";
 		qu += "DELETE from custom_data where uid = " 
 			+ QString::number(m_uid) + ";";
 		return qu;
 	}
 	
 
 	
 
 	FindQuery::FindQuery(int uid)
 		: OSQLQuery(), m_uid( uid ) {
 	}
 	FindQuery::FindQuery(const QArray<int>& ints)
 		: OSQLQuery(), m_uids( ints ){
 	}
 	FindQuery::~FindQuery() {
 	}
 	QString FindQuery::query()const{
 // 		if ( m_uids.count() == 0 )
 		return single();
 	}
 	/*
 	  else
 			return multi();
 			}
         QString FindQuery::multi()const {
 		QString qu = "select uid, type, value from addressbook where";
 		for (uint i = 0; i < m_uids.count(); i++ ) {
 			qu += " UID = " + QString::number( m_uids[i] ) + " OR";
 		}
 		qu.remove( qu.length()-2, 2 ); // Hmmmm.. 
 		return qu;
 	}
 	*/
 	QString FindQuery::single()const{
 		QString qu = "select *";
 		qu += " from addressbook where uid = " + QString::number(m_uid);
 
 		// qWarning("find query: %s", qu.latin1() );
 		return qu;
 	}
 
 
 	FindCustomQuery::FindCustomQuery(int uid)
 		: OSQLQuery(), m_uid( uid ) {
 	}
 	FindCustomQuery::FindCustomQuery(const QArray<int>& ints)
 		: OSQLQuery(), m_uids( ints ){
 	}
 	FindCustomQuery::~FindCustomQuery() {
 	}
 	QString FindCustomQuery::query()const{
 //		if ( m_uids.count() == 0 )
 			return single();
 	}
 	QString FindCustomQuery::single()const{
 		QString qu = "select uid, type, value from custom_data where uid = ";
 		qu += QString::number(m_uid);
 		return qu;
 	}
 
 };
 
 
 /* --------------------------------------------------------------------------- */
 
 namespace Opie {
 
 OPimContactAccessBackend_SQL::OPimContactAccessBackend_SQL ( const QString& /* appname */, 
 						       const QString& filename ): 
 	OPimContactAccessBackend(), m_changed(false), m_driver( NULL )
 {
 	qDebug("C'tor OPimContactAccessBackend_SQL starts");
 	QTime t;
 	t.start();
 
 	/* Expecting to access the default filename if nothing else is set */
 	if ( filename.isEmpty() ){
 		m_fileName = Global::applicationFileName( "addressbook","addressbook.db" );
 	} else
 		m_fileName = filename;
 
 	// Get the standart sql-driver from the OSQLManager..
 	OSQLManager man;
 	m_driver = man.standard();
 	m_driver->setUrl( m_fileName );	
 
 	load();
 
 	qDebug("C'tor OPimContactAccessBackend_SQL ends: %d ms", t.elapsed() );
 }
 
 OPimContactAccessBackend_SQL::~OPimContactAccessBackend_SQL ()
 {
 	if( m_driver )
 		delete m_driver;
 }
 
 bool OPimContactAccessBackend_SQL::load ()
 {
 	if (!m_driver->open() )
 		return false;
 
 	// Don't expect that the database exists.
 	// It is save here to create the table, even if it
 	// do exist. ( Is that correct for all databases ?? )
 	CreateQuery creat;
 	OSQLResult res = m_driver->query( &creat );
 
 	update();
 
 	return true;
 
 }
 
 bool OPimContactAccessBackend_SQL::reload()
 {
 	return load();
 }
 
 bool OPimContactAccessBackend_SQL::save()
 {
 	return m_driver->close();  // Shouldn't m_driver->sync be better than close ? (eilers)
 }
 
 
 void OPimContactAccessBackend_SQL::clear ()
 {
 	ClearQuery cle;
 	OSQLResult res = m_driver->query( &cle );
 
 	reload();
 }
 
 bool OPimContactAccessBackend_SQL::wasChangedExternally()
 {
 	return false;
 }
 
 QArray<int> OPimContactAccessBackend_SQL::allRecords() const
 {
 
 	// FIXME: Think about cute handling of changed tables..
 	// Thus, we don't have to call update here...
  	if ( m_changed )  
 		((OPimContactAccessBackend_SQL*)this)->update();
 	
 	return m_uids;
 }
 
 bool OPimContactAccessBackend_SQL::add ( const OPimContact &newcontact )
 {
+	qDebug("add in contact SQL-Backend");
 	InsertQuery ins( newcontact );
 	OSQLResult res = m_driver->query( &ins );
 
 	if ( res.state() == OSQLResult::Failure )
 		return false;
 
 	int c = m_uids.count();
 	m_uids.resize( c+1 );
 	m_uids[c] = newcontact.uid();
 	
 	return true;
 }
 
 
 bool OPimContactAccessBackend_SQL::remove ( int uid )
 {
 	RemoveQuery rem( uid );
 	OSQLResult res = m_driver->query(&rem );
 
 	if ( res.state() == OSQLResult::Failure )
 		return false;
 
 	m_changed = true;
 
 	return true;
 }
 
 bool OPimContactAccessBackend_SQL::replace ( const OPimContact &contact )
 {
 	if ( !remove( contact.uid() ) )
 		return false;
 	
 	return add( contact );
 }
 
 
 OPimContact OPimContactAccessBackend_SQL::find ( int uid ) const
 {
 	qDebug("OPimContactAccessBackend_SQL::find()");
 	QTime t;
 	t.start();
 
 	OPimContact retContact( requestNonCustom( uid ) );
 	retContact.setExtraMap( requestCustom( uid ) );
 
 	qDebug("OPimContactAccessBackend_SQL::find() needed: %d ms", t.elapsed() );
 	return retContact;
 }
 
 
 
 QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, const QDateTime& qd )
 {
 	QString qu = "SELECT uid FROM addressbook WHERE";
 	QString searchQuery ="";
 
 	QDate startDate;
 	
 	if ( qd.isValid() )
 		startDate = qd.date();
 	else
 		startDate = QDate::currentDate();
 	
 
 	QMap<int, QString> queryFields = query.toMap();
 	QStringList fieldList = OPimContactFields::untrfields( false );
 	QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
 
 	// Convert every filled field to a SQL-Query
 // 	bool isAnyFieldSelected = false;
 	for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
 
 		int id = translate[*it];
 		QString queryStr = queryFields[id];
 		QDate* endDate = 0l;
 
 		if ( !queryStr.isEmpty() ){
 			// If something is alredy stored in the query, add an "AND"
 			// to the end of the string to prepare for the next ..
 			if ( !searchQuery.isEmpty() )
 				searchQuery += " AND";
 
 // 			isAnyFieldSelected = true;
 			switch( id ){
 			case Qtopia::Birthday:
 				endDate = new QDate( query.birthday() ); 
 				// Fall through !
 			case Qtopia::Anniversary:
 				if ( endDate == 0l )
 					endDate = new QDate( query.anniversary() );
 
 				if ( settings & OPimContactAccess::DateDiff ) {
 					searchQuery += QString( " (\"%1\" <= '%2-%3-%4\' AND \"%5\" >= '%6-%7-%8')" )
 						.arg( *it )
 						.arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) )
 						.arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) )
 						.arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) )
 						.arg( *it )
 						.arg( QString::number( startDate.year() ).rightJustify( 4, '0' ) )
 						.arg( QString::number( startDate.month() ).rightJustify( 2, '0' ) ) 
 						.arg( QString::number( startDate.day() ).rightJustify( 2, '0' ) ) ;
 				}
 
 				if ( settings & OPimContactAccess::DateYear ){
 					if ( settings & OPimContactAccess::DateDiff )
 						searchQuery += " AND";
 
 					searchQuery += QString( " (\"%1\" LIKE '%2-%')" )
 						.arg( *it )
 						.arg( QString::number( endDate->year() ).rightJustify( 4, '0' ) );
 				}
 
 				if ( settings & OPimContactAccess::DateMonth ){
 					if ( ( settings & OPimContactAccess::DateDiff ) 
 					     || ( settings & OPimContactAccess::DateYear ) )
 						searchQuery += " AND";
 
 					searchQuery += QString( " (\"%1\" LIKE '%-%2-%')" )
 						.arg( *it )
 						.arg( QString::number( endDate->month() ).rightJustify( 2, '0' ) );
 				}
 
 				if ( settings & OPimContactAccess::DateDay ){
 					if ( ( settings & OPimContactAccess::DateDiff ) 
 					     || ( settings & OPimContactAccess::DateYear ) 
 					     || ( settings & OPimContactAccess::DateMonth ) )
 						searchQuery += " AND";
 
 					searchQuery += QString( " (\"%1\" LIKE '%-%-%2')" )
 						.arg( *it )
 						.arg( QString::number( endDate->day() ).rightJustify( 2, '0' ) );
 				}
 
 				break;
 			default:
 				// Switching between case sensitive and insensitive...
 				// LIKE is not case sensitive, GLOB is case sensitive
 				// Do exist a better solution to switch this ?
 				if ( settings & OPimContactAccess::IgnoreCase )
 					searchQuery += "(\"" + *it + "\"" + " LIKE " + "'" 
 						+ queryStr.replace(QRegExp("\\*"),"%") + "'" + ")"; 
 				else
 					searchQuery += "(\"" + *it + "\"" + " GLOB " + "'" 
 						+ queryStr + "'" + ")"; 
 					
 			}
 		}
 	}
 	// Skip trailing "AND"
 // 	if ( isAnyFieldSelected )
 // 		qu = qu.left( qu.length() - 4 );
 
 	qu += searchQuery;
 
 	qDebug( "queryByExample query: %s", qu.latin1() );
 
 	// Execute query and return the received uid's
 	OSQLRawQuery raw( qu );
 	OSQLResult res = m_driver->query( &raw );
 	if ( res.state() != OSQLResult::Success ){
 		QArray<int> empty;
 		return empty;
 	}
 
 	QArray<int> list = extractUids( res );
 
 	return list;		
 }
 
 QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
 {
 #if 0
 	QArray<int> nix(0);
 	return nix;
 
 #else
 	QString qu = "SELECT uid FROM addressbook WHERE (";
 	QString searchlist;
 
 	QStringList fieldList = OPimContactFields::untrfields( false );
 	// QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
 	for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
 		if ( !searchlist.isEmpty() )
 			searchlist += " OR ";
 		searchlist += " rlike(\""+ r.pattern() + "\",\"" + *it + "\") ";
 	}
 		
 	qu = qu + searchlist + ")";
 
 	qDebug( "query: %s", qu.latin1() );
 
 	OSQLRawQuery raw( qu );
 	OSQLResult res = m_driver->query( &raw );
 
 	return extractUids( res );
 
 
 #endif
 }
 
 const uint OPimContactAccessBackend_SQL::querySettings()
 {
 	return OPimContactAccess::IgnoreCase 
 		| OPimContactAccess::WildCards
 		| OPimContactAccess::DateDiff
 		| OPimContactAccess::DateYear
 		| OPimContactAccess::DateMonth
 		| OPimContactAccess::DateDay
 		;
 }
 
 bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
 {
 	/* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
 	 * may be added with any of the other settings. IgnoreCase should never used alone.
 	 * Wildcards, RegExp, ExactMatch should never used at the same time...
 	 */
 
 	// Step 1: Check whether the given settings are supported by this backend
 	if ( ( querySettings & ( 
 				OPimContactAccess::IgnoreCase
 				| OPimContactAccess::WildCards
  				| OPimContactAccess::DateDiff
  				| OPimContactAccess::DateYear
  				| OPimContactAccess::DateMonth
  				| OPimContactAccess::DateDay
 // 				| OPimContactAccess::RegExp
 // 				| OPimContactAccess::ExactMatch
 			       ) ) != querySettings )
 		return false;
 
 	// Step 2: Check whether the given combinations are ok..
 
 	// IngoreCase alone is invalid
 	if ( querySettings == OPimContactAccess::IgnoreCase )
 		return false;
 
 	// WildCards, RegExp and ExactMatch should never used at the same time 
 	switch ( querySettings & ~( OPimContactAccess::IgnoreCase
 				    | OPimContactAccess::DateDiff
 				    | OPimContactAccess::DateYear
 				    | OPimContactAccess::DateMonth
 				    | OPimContactAccess::DateDay
 				    )
 		 ){
 	case OPimContactAccess::RegExp:
 		return ( true );
 	case OPimContactAccess::WildCards:
 		return ( true );
 	case OPimContactAccess::ExactMatch:
 		return ( true );
 	case 0: // one of the upper removed bits were set..
 		return ( true );
 	default:
 		return ( false );
 	}
 
 }
 
 QArray<int> OPimContactAccessBackend_SQL::sorted( bool asc,  int , int ,  int )
 {
 	QTime t;
 	t.start();
 
 	QString query = "SELECT uid FROM addressbook ";
 	query += "ORDER BY \"Last Name\" ";
 
 	if ( !asc )
 		query += "DESC";
 
 	// qDebug("sorted query is: %s", query.latin1() ); 
 
 	OSQLRawQuery raw( query );
 	OSQLResult res = m_driver->query( &raw );
 	if ( res.state() != OSQLResult::Success ){
 		QArray<int> empty;
 		return empty;
 	}
 
 	QArray<int> list = extractUids( res );
 
 	qDebug("sorted needed %d ms!", t.elapsed() );
 	return list;
 }
 
 
 void OPimContactAccessBackend_SQL::update()
 {
 	qDebug("Update starts");
 	QTime t;
 	t.start();
 
 	// Now load the database set and extract the uid's
 	// which will be held locally
 
 	LoadQuery lo;
 	OSQLResult res = m_driver->query(&lo);
 	if ( res.state() != OSQLResult::Success )
 		return;
 
 	m_uids = extractUids( res );
 
 	m_changed = false;
 
 	qDebug("Update ends %d ms", t.elapsed() );
 }
 
 QArray<int> OPimContactAccessBackend_SQL::extractUids( OSQLResult& res ) const
 {
 	qDebug("extractUids");
 	QTime t;
 	t.start();
 	OSQLResultItem::ValueList list = res.results();
 	OSQLResultItem::ValueList::Iterator it;
 	QArray<int> ints(list.count() );
 	qDebug(" count = %d", list.count() );
 
 	int i = 0;
 	for (it = list.begin(); it != list.end(); ++it ) {
 		ints[i] =  (*it).data("uid").toInt();
 		i++;
 	}
 	qDebug("extractUids ready: count2 = %d needs %d ms", i, t.elapsed() );
 
 	return ints;
 
 }
 
 QMap<int, QString>  OPimContactAccessBackend_SQL::requestNonCustom( int uid ) const
 {
 	QTime t;
 	t.start();
 
 	QMap<int, QString> nonCustomMap;
 	
 	int t2needed = 0;
 	int t3needed = 0;
 	QTime t2;
 	t2.start();
 	FindQuery query( uid );
 	OSQLResult res_noncustom = m_driver->query( &query );
 	t2needed = t2.elapsed();
 
 	OSQLResultItem resItem = res_noncustom.first();
 
 	QTime t3;
 	t3.start();
 	// Now loop through all columns
 	QStringList fieldList = OPimContactFields::untrfields( false );
 	QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
 	for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
 		// Get data for the selected column and store it with the
 		// corresponding id into the map..
 
 		int id =  translate[*it];
 		QString value = resItem.data( (*it) );
 		
 		// qDebug("Reading %s... found: %s", (*it).latin1(), value.latin1() );
 
 		switch( id ){
 		case Qtopia::Birthday:
 		case Qtopia::Anniversary:{
 			// Birthday and Anniversary are encoded special ( yyyy-mm-dd )
 			QStringList list = QStringList::split( '-', value );
 			QStringList::Iterator lit = list.begin();
 			int year  = (*lit).toInt();
 			int month = (*(++lit)).toInt();
 			int day   = (*(++lit)).toInt();
 			if ( ( day != 0 ) && ( month != 0 ) && ( year != 0 ) ){
 			     QDate date( year, month, day );
 			     nonCustomMap.insert( id, OPimDateConversion::dateToString( date ) );
 			}
 		}
 			break;
 		case Qtopia::AddressCategory:
 			qDebug("Category is: %s", value.latin1() );
 		default:
 			nonCustomMap.insert( id, value );
 		}
 	}
 
 	// First insert uid
 	nonCustomMap.insert( Qtopia::AddressUid, resItem.data( "uid" ) ); 
 	t3needed = t3.elapsed();
 
 	// qDebug("Adding UID: %s", resItem.data( "uid" ).latin1() );
 	qDebug("RequestNonCustom needed: insg.:%d ms, query: %d ms, mapping: %d ms", 
 		 t.elapsed(), t2needed, t3needed  );
 
 	return nonCustomMap;
 }
 
 QMap<QString, QString>  OPimContactAccessBackend_SQL::requestCustom( int uid ) const
 {
 	QTime t;
 	t.start();
 
 	QMap<QString, QString> customMap;
 	
 	FindCustomQuery query( uid );
 	OSQLResult res_custom = m_driver->query( &query );
 
 	if ( res_custom.state() == OSQLResult::Failure ) {
 		qWarning("OSQLResult::Failure in find query !!");
 		QMap<QString, QString> empty;
 		return empty;
 	}
 
 	OSQLResultItem::ValueList list = res_custom.results();
 	OSQLResultItem::ValueList::Iterator it = list.begin();
 	for ( ; it != list.end(); ++it ) {
 		customMap.insert( (*it).data( "type" ), (*it).data( "value" ) );
 	}
 
 	qDebug("RequestCustom needed: %d ms", t.elapsed() );
 	return customMap;
 }
 
 }
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp
index 4f9b504..67f267f 100644
--- a/libopie2/opiepim/core/ocontactaccess.cpp
+++ b/libopie2/opiepim/core/ocontactaccess.cpp
@@ -1,152 +1,158 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  */
 
 #include "ocontactaccess.h"
 #include "obackendfactory.h"
 
 #include <qasciidict.h>
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qregexp.h>
 #include <qlist.h>
 #include <qcopchannel_qws.h>
 
 //#include <qpe/qcopenvelope_qws.h>
 #include <qpe/global.h>
 
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 
 #include <opie2/ocontactaccessbackend_xml.h>
+#include <opie2/opimresolver.h>
 
 namespace Opie {
 
 OPimContactAccess::OPimContactAccess ( const QString appname, const QString ,
 			 OPimContactAccessBackend* end, bool autosync ):
 	OPimAccessTemplate<OPimContact>( end )
 {
         /* take care of the backend. If there is no one defined, we
 	 * will use the XML-Backend as default (until we have a cute SQL-Backend..).
 	 */
         if( end == 0 ) {
 		qWarning ("Using BackendFactory !");
 		end = OBackendFactory<OPimContactAccessBackend>::Default( "contact", appname );
         }
 	// Set backend locally and in template
         m_backEnd = end;
 	OPimAccessTemplate<OPimContact>::setBackEnd (end);
 
 
 	/* Connect signal of external db change to function */
 	QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this );
 	connect( dbchannel, SIGNAL(received(const QCString&,const QByteArray&)),
                this, SLOT(copMessage(const QCString&,const QByteArray&)) );
 	if ( autosync ){
 		QCopChannel *syncchannel = new QCopChannel( "QPE/Sync", this );
 		connect( syncchannel, SIGNAL(received(const QCString&,const QByteArray&)),
 			 this, SLOT(copMessage(const QCString&,const QByteArray&)) );
 	}
 
 
 }
 OPimContactAccess::~OPimContactAccess ()
 {
 	/* The user may forget to save the changed database, therefore try to
 	 * do it for him..
 	 */
 	save();
 	// delete m_backEnd; is done by template..
 }
 
 
 bool OPimContactAccess::save ()
 {
 	/* If the database was changed externally, we could not save the
 	 * Data. This will remove added items which is unacceptable !
 	 * Therefore: Reload database and merge the data...
 	 */
 	if ( OPimAccessTemplate<OPimContact>::wasChangedExternally() )
 		reload();
 
 	bool status = OPimAccessTemplate<OPimContact>::save();
 	if ( !status ) return false;
 
 	/* Now tell everyone that new data is available.
 	 */
 	QCopEnvelope e( "QPE/PIM", "addressbookUpdated()" );
 
 	return true;
 }
 
 const uint OPimContactAccess::querySettings()
 {
 	return ( m_backEnd->querySettings() );
 }
 
 bool OPimContactAccess::hasQuerySettings ( int querySettings ) const
 {
 	return ( m_backEnd->hasQuerySettings ( querySettings ) );
 }
 OPimRecordList<OPimContact> OPimContactAccess::sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const
 {
 	QArray<int> matchingContacts = m_backEnd -> sorted( ascending, sortOrder, sortFilter, cat );
 	return ( OPimRecordList<OPimContact>(matchingContacts, this) );
 }
 
 
 bool OPimContactAccess::wasChangedExternally()const
 {
 	return ( m_backEnd->wasChangedExternally() );
 }
 
 
 void OPimContactAccess::copMessage( const QCString &msg, const QByteArray & )
 {
 	if ( msg == "addressbookUpdated()" ){
 		qWarning ("OPimContactAccess: Received addressbokUpdated()");
 		emit signalChanged ( this );
 	} else if ( msg == "flush()" ) {
 		qWarning ("OPimContactAccess: Received flush()");
 		save ();
 	} else if ( msg == "reload()" ) {
 		qWarning ("OPimContactAccess: Received reload()");
 		reload ();
 		emit signalChanged ( this );
 	}
 }
 
+int OPimContactAccess::rtti() const
+{
+	return OPimResolver::AddressBook;
+}
+
 }
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index cf5333a..4429b6f 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -1,158 +1,163 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 /*
  * =====================================================================
  * ToDo: Define enum for query settings
  * =====================================================================
  */
 #ifndef _OCONTACTACCESS_H
 #define _OCONTACTACCESS_H
 
 #include <qobject.h>
 
 #include <qpe/qcopenvelope_qws.h>
 
 #include <qvaluelist.h>
 #include <qfileinfo.h>
 
 #include <opie2/opimcontact.h>
 #include <opie2/ocontactaccessbackend.h>
 #include <opie2/opimaccesstemplate.h>
 
 namespace Opie {
 /**
  * Class to access the contacts database.
  * This is just a frontend for the real database handling which is
  * done by the backend.
  * This class is used to access the Contacts on a system. This class as any OPIE PIM
  * class is backend independent.
  * @author Stefan Eilers, Holger Freyther
  * @see OPimAccessTemplate
  */
 class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
 {
     Q_OBJECT
 
  public:
 	/**
          * Create Database with contacts (addressbook).
 	 * @param appname Name of application which wants access to the database
 	 * (i.e. "todolist")
 	 * @param filename The name of the database file. If not set, the default one
 	 * is used.
 	 * @param backend Pointer to an alternative Backend. If not set, we will use
 	 * the default backend.
 	 * @param handlesync If <b>true</b> the database stores the current state
 	 * automatically if it receives the signals <i>flush()</i> and <i>reload()</i>
 	 * which are used before and after synchronisation. If the application wants
 	 * to react itself, it should be disabled by setting it to <b>false</b>
 	 * @see OPimContactAccessBackend
 	 */
 	OPimContactAccess (const QString appname, const QString filename = 0l,
                     OPimContactAccessBackend* backend = 0l, bool handlesync = true);
 	~OPimContactAccess ();
 
 	/** Constants for query.
 	 * Use this constants to set the query parameters.
 	 * Note: <i>query_IgnoreCase</i> just make sense with one of the other attributes !
 	 * @see queryByExample()
 	 */
 	enum QuerySettings {
 		WildCards  = 0x0001,
 		IgnoreCase = 0x0002,
 		RegExp     = 0x0004,
 		ExactMatch = 0x0008,
 		MatchOne   = 0x0010, // Only one Entry must match
 		DateDiff   = 0x0020, // Find all entries from today until given date
 		DateYear   = 0x0040, // The year matches
 		DateMonth  = 0x0080, // The month matches
 		DateDay    = 0x0100, // The day matches
 	};
 
 
 	/** Return all Contacts in a sorted manner.
 	 *  @param ascending true: Sorted in acending order.
 	 *  @param sortOrder Currently not implemented. Just defined to stay compatible to otodoaccess
 	 *  @param sortFilter Currently not implemented. Just defined to stay compatible to otodoaccess
 	 *  @param cat Currently not implemented. Just defined to stay compatible to otodoaccess
 	 */
 	List sorted( bool ascending, int sortOrder, int sortFilter, int cat ) const;
 
 	/** Return all possible settings.
 	 *  @return All settings provided by the current backend
 	 * (i.e.: query_WildCards & query_IgnoreCase)
 	 */
 	const uint querySettings();
 
 	/** Check whether settings are correct.
 	 * @return <i>true</i> if the given settings are correct and possible.
 	 */
 	bool hasQuerySettings ( int querySettings ) const;
 
 	/**
 	 * if the resource was changed externally.
 	 * You should use the signal instead of polling possible changes !
 	 */
 	bool wasChangedExternally()const;
 
 
 	/** Save contacts database.
 	 * Save is more a "commit". After calling this function, all changes are public available.
 	 * @return true if successful
 	 */
 	bool save();
+	
+	/** 
+	 * Return identification of used records
+	 */
+	int rtti() const;
 
  signals:
 	/* Signal is emitted if the database was changed. Therefore
 	 * we may need to reload to stay consistent.
 	 * @param which Pointer to the database who created this event. This pointer
 	 * is useful if an application has to handle multiple databases at the same time.
 	 * @see reload()
 	 */
 	void signalChanged ( const OPimContactAccess *which );
 
 
  private:
 	// class OPimContactAccessPrivate;
 	// OPimContactAccessPrivate* d;
         OPimContactAccessBackend *m_backEnd;
         bool m_loading:1;
 
  private slots:
 	void copMessage( const QCString &msg, const QByteArray &data );
 
  private:
         class Private;
 	Private *d;
 
 };
 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/odatebookaccess.cpp b/libopie2/opiepim/core/odatebookaccess.cpp
index ac310c1..29298ea 100644
--- a/libopie2/opiepim/core/odatebookaccess.cpp
+++ b/libopie2/opiepim/core/odatebookaccess.cpp
@@ -1,112 +1,117 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #include <opie2/obackendfactory.h>
 #include <opie2/odatebookaccess.h>
+#include <opie2/opimresolver.h>
 
 namespace Opie {
 /**
  * Simple constructor
  * It takes a ODateBookAccessBackend as parent. If it is 0 the default implementation
  * will be used!
  * @param back The backend to be used or 0 for the default backend
  * @param ac What kind of access is intended
  */
 ODateBookAccess::ODateBookAccess( ODateBookAccessBackend* back, enum Access ac )
     : OPimAccessTemplate<OPimEvent>( back )
 {
     if (!back )
         back = OBackendFactory<ODateBookAccessBackend>::Default("datebook", QString::null );
 
     m_backEnd = back;
     setBackEnd( m_backEnd );
 }
 ODateBookAccess::~ODateBookAccess() {
 }
 
 /**
  * @return all events available
  */
 ODateBookAccess::List ODateBookAccess::rawEvents()const {
     QArray<int> ints = m_backEnd->rawEvents();
 
     List lis( ints, this );
     return lis;
 }
 
 /**
  * @return all repeating events
  */
 ODateBookAccess::List ODateBookAccess::rawRepeats()const {
     QArray<int> ints = m_backEnd->rawRepeats();
 
     List lis( ints, this );
     return lis;
 }
 
 /**
  * @return all non repeating events
  */
 ODateBookAccess::List ODateBookAccess::nonRepeats()const {
     QArray<int> ints = m_backEnd->nonRepeats();
 
     List lis( ints, this );
     return lis;
 }
 
 /**
  * @return dates in the time span between from and to
  * @param from Include all events from...
  * @param to Include all events to...
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveEvents( const QDate& from, const QDate& to ) const {
     return m_backEnd->effectiveEvents( from, to );
 }
 /**
  * @return all events at a given datetime
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveEvents( const QDateTime& start ) const {
     return m_backEnd->effectiveEvents( start );
 }
 
 /**
  * @return non repeating dates in the time span between from and to
  * @param from Include all events from...
  * @param to Include all events to...
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveNonRepeatingEvents( const QDate& from, const QDate& to ) const {
     return m_backEnd->effectiveNonRepeatingEvents( from, to );
 }
 /**
  * @return all non repeating events at a given datetime
  */
 OEffectiveEvent::ValueList ODateBookAccess::effectiveNonRepeatingEvents( const QDateTime& start ) const {
     return m_backEnd->effectiveNonRepeatingEvents( start );
 }
+int ODateBookAccess::rtti() const
+{
+	return OPimResolver::DateBook;
+}
 
 }
diff --git a/libopie2/opiepim/core/odatebookaccess.h b/libopie2/opiepim/core/odatebookaccess.h
index 6c9290f..c6c3598 100644
--- a/libopie2/opiepim/core/odatebookaccess.h
+++ b/libopie2/opiepim/core/odatebookaccess.h
@@ -1,75 +1,81 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) Stefan Eilers (Eilers.Stefan@epost.de)
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_DATE_BOOK_ACCESS_H
 #define OPIE_DATE_BOOK_ACCESS_H
 
 #include "odatebookaccessbackend.h"
 #include "opimaccesstemplate.h"
 
 #include <opie2/opimevent.h>
 
 namespace Opie {
 /**
  * This is the object orientated datebook database. It'll use OBackendFactory
  * to query for a backend.
  * All access to the datebook should be done via this class.
  * Make sure to load and save the datebook this is not part of
  * destructing and creating the object
  *
  * @author Holger Freyther, Stefan Eilers
  */
 class ODateBookAccess : public OPimAccessTemplate<OPimEvent> {
 public:
     ODateBookAccess( ODateBookAccessBackend* = 0l, enum Access acc = Random );
     ~ODateBookAccess();
 
     /* return all events */
     List rawEvents()const;
 
     /* return repeating events */
     List rawRepeats()const;
 
     /* return non repeating events */
     List nonRepeats()const;
 
     /* return non repeating events (from,to) */
     OEffectiveEvent::ValueList effectiveEvents( const QDate& from, const QDate& to ) const;
     OEffectiveEvent::ValueList effectiveEvents( const QDateTime& start ) const;
     OEffectiveEvent::ValueList effectiveNonRepeatingEvents( const QDate& from, const QDate& to ) const;
     OEffectiveEvent::ValueList effectiveNonRepeatingEvents( const QDateTime& start ) const;
 
+    /** 
+     * Return identification of used records
+     */
+    int rtti() const;
+
+
 private:
     ODateBookAccessBackend* m_backEnd;
     class Private;
     Private* d;
 };
 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index f1bcc44..d4c5fbb 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -1,335 +1,357 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) The Main Author <main-author@whereever.org>
+                             Copyright (C) Holger Freyther <zecke@handhelds.org>
+			     Copyright (C) Stefan Eilers <eilers.stefan@epost.de>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_PIM_ACCESS_TEMPLATE_H
 #define OPIE_PIM_ACCESS_TEMPLATE_H
 
 #include <qarray.h>
 
 #include <opie2/opimrecord.h>
 #include <opie2/opimaccessbackend.h>
 #include <opie2/opimrecordlist.h>
 
 #include <opie2/opimcache.h>
 #include <opie2/opimtemplatebase.h>
 
 namespace Opie {
 
 class OPimAccessTemplatePrivate;
 /**
  * Thats the frontend to our OPIE PIM
  * Library. Either you want to use it's
  * interface or you want to implement
  * your own Access lib
  * Just create a OPimRecord and inherit from
  * the plugins
  */
 
 template <class T = OPimRecord >
 class OPimAccessTemplate : public OTemplateBase<T> {
 public:
     enum Access {
         Random = 0,
         SortedAccess
     };
     typedef OPimRecordList<T> List;
     typedef OPimAccessBackend<T> BackEnd;
     typedef OPimCache<T> Cache;
 
     /**
      * c'tor BackEnd
      * enum Access a small hint on how to handle the backend
      */
     OPimAccessTemplate( BackEnd* end);
 
     virtual ~OPimAccessTemplate();
 
     /**
      * load from the backend
      */
     bool load();
 
     /** Reload database.
      * You should execute this function if the external database
      * was changed.
      * This function will load the external database and afterwards
      * rejoin the local changes. Therefore the local database will be set consistent.
      */
     virtual bool reload();
 
     /** Save contacts database.
      * Save is more a "commit". After calling this function, all changes are public available.
      * @return true if successful
      */
     bool save();
 
     /**
      * if the resource was changed externally
      * You should use the signal handling instead of polling possible changes !
      * zecke: Do you implement a signal for otodoaccess ?
      */
     bool wasChangedExternally()const;
 
     /**
      * return a List of records
      * you can iterate over them
      */
     virtual List allRecords()const;
  
      /** 
      * return a List of records
      * that match the regex
      */
     virtual List matchRegexp(  const QRegExp &r ) const;   
 
     /**
      * queryByExample.
      * @see otodoaccess, ocontactaccess
      */
     virtual List queryByExample( const T& t, int querySettings, const QDateTime& d = QDateTime() );
 
     /**
      * find the OPimRecord uid
      */
     virtual T find( int uid )const;
 
     /**
      * read ahead cache find method ;)
      */
     virtual T find( int uid, const QArray<int>&,
                     uint current, typename OTemplateBase<T>::CacheDirection dir = OTemplateBase<T>::Forward )const;
 
     /* invalidate cache here */
     /**
      * clears the backend and invalidates the backend
      */
     void clear() ;
 
     /**
      * add T to the backend
      * @param t The item to add.
      * @return <i>true</i> if added successfully.
      */
     virtual bool add( const T& t ) ;
     bool add( const OPimRecord& );
+    // Needed for real generic access (eilers) 
+    // Info: Take this if  you are working with OPimRecord, which is a generic base class, and 
+    //       you need to add it into any database, you cannot generate a reference to
+    //       it and casting may be not approriate, too. 
+    //       But take care that the accessing database is compatible to the real type of OPimRecord !!
+    bool add( const OPimRecord* );
+
 
     /* only the uid matters */
     /**
      * remove T from the backend
      * @param t The item to remove
      * @return <i>true</i> if successful.
      */
     virtual bool remove( const T& t );
 
     /**
      * remove the OPimRecord with uid
      * @param uid The ID of the item to remove
      * @return <i>true</i> if successful.
      */
     bool remove( int uid );
     bool remove( const OPimRecord& );
 
     /**
      * replace T from backend
      * @param t The item to replace
      * @return <i>true</i> if successful.
      */
     virtual bool replace( const T& t) ;
 
     void setReadAhead( uint count );
     /**
      * @internal
      */
     void cache( const T& )const;
     void setSaneCacheSize( int );
 
     QArray<int> records()const;
 protected:
     /**
      * invalidate the cache
      */
     void invalidateCache();
 
     void setBackEnd( BackEnd* end );
     /**
      * returns the backend
      */
     BackEnd* backEnd();
     BackEnd* m_backEnd;
     Cache m_cache;
 
 private:
     OPimAccessTemplatePrivate *d;
 
 };
 
 template <class T>
 OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end )
     : OTemplateBase<T>(), m_backEnd( end )
 {
     if (end )
         end->setFrontend( this );
 }
 template <class T>
 OPimAccessTemplate<T>::~OPimAccessTemplate() {
     qWarning("~OPimAccessTemplate<T>");
     delete m_backEnd;
 }
 template <class T>
 bool OPimAccessTemplate<T>::load() {
     invalidateCache();
     return m_backEnd->load();
 }
 template <class T>
 bool OPimAccessTemplate<T>::reload() {
 	invalidateCache();  // zecke: I think this should be added (se)
 	return m_backEnd->reload();
 }
 template <class T>
 bool OPimAccessTemplate<T>::save() {
     return m_backEnd->save();
 }
 template <class T>
 typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const {
     QArray<int> ints = m_backEnd->allRecords();
     List lis(ints, this );
     return lis;
 }
 template <class T>
 typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::matchRegexp( const QRegExp &r )const {
     QArray<int> ints = m_backEnd->matchRegexp( r );
     List lis(ints, this );
     return lis;
 }
 template <class T>
 QArray<int> OPimAccessTemplate<T>::records()const {
     return m_backEnd->allRecords();
 }
 template <class T>
 typename OPimAccessTemplate<T>::List
 OPimAccessTemplate<T>::queryByExample( const T& t, int settings, const QDateTime& d ) {
     QArray<int> ints = m_backEnd->queryByExample( t, settings, d );
 
     List lis(ints, this );
     return lis;
 }
 template <class T>
 T OPimAccessTemplate<T>::find( int uid ) const{
     T t = m_backEnd->find( uid );
     cache( t );
     return t;
 }
 template <class T>
 T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar,
                                uint current, typename OTemplateBase<T>::CacheDirection dir )const {
     /*
      * better do T.isEmpty()
      * after a find this way we would
      * avoid two finds in QCache...
      */
     // qWarning("find it now %d", uid );
     if (m_cache.contains( uid ) ) {
         return m_cache.find( uid );
     }
 
     T t = m_backEnd->find( uid, ar, current, dir );
     cache( t );
     return t;
 }
 template <class T>
 void OPimAccessTemplate<T>::clear() {
     invalidateCache();
     m_backEnd->clear();
 }
 template <class T>
 bool OPimAccessTemplate<T>::add( const T& t ) {
     cache( t );
     return m_backEnd->add( t );
 }
+
 template <class T>
 bool OPimAccessTemplate<T>::add( const OPimRecord& rec) {
     /* same type */
-    if ( rec.rtti() == T::rtti() ) {
-        const T &t = static_cast<const T&>(rec);
+    T tempInstance;
+    if ( rec.rtti() == tempInstance.rtti() ) {
+        const T& t = static_cast<const T&>(rec);
         return add(t);
     }
     return false;
 }
+
+template <class T>
+bool OPimAccessTemplate<T>::add( const OPimRecord* rec) {
+    /* same type, but pointer  */
+    T tempInstance;
+    if ( rec -> rtti() == tempInstance.rtti() ) {
+        const T* t = static_cast<const T*>(rec);
+        return add( *t );
+    }
+    return false;
+}
+
 template <class T>
 bool OPimAccessTemplate<T>::remove( const T& t ) {
     return remove( t.uid() );
 }
 template <class T>
 bool OPimAccessTemplate<T>::remove( int uid ) {
     m_cache.remove( uid );
     return m_backEnd->remove( uid );
 }
 template <class T>
 bool OPimAccessTemplate<T>::remove( const OPimRecord& rec) {
     return remove( rec.uid() );
 }
 template <class T>
 bool OPimAccessTemplate<T>::replace( const T& t ) {
     m_cache.replace( t );
     return m_backEnd->replace( t );
 }
 template <class T>
 void OPimAccessTemplate<T>::invalidateCache() {
     m_cache.invalidate();
 }
 template <class T>
 typename OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() {
     return m_backEnd;
 }
 template <class T>
 bool OPimAccessTemplate<T>::wasChangedExternally()const {
     return false;
 }
 template <class T>
 void OPimAccessTemplate<T>::setBackEnd( BackEnd* end ) {
     m_backEnd = end;
     if (m_backEnd )
         m_backEnd->setFrontend( this );
 }
 template <class T>
 void OPimAccessTemplate<T>::cache( const T& t ) const{
     /* hacky we need to work around the const*/
     ((OPimAccessTemplate<T>*)this)->m_cache.add( t );
 }
 template <class T>
 void OPimAccessTemplate<T>::setSaneCacheSize( int size ) {
     m_cache.setSize( size );
 }
 template <class T>
 void OPimAccessTemplate<T>::setReadAhead( uint count ) {
     m_backEnd->setReadAhead( count );
 }
 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/opimtemplatebase.h b/libopie2/opiepim/core/opimtemplatebase.h
index 58cbfeb..b48dfed 100644
--- a/libopie2/opiepim/core/opimtemplatebase.h
+++ b/libopie2/opiepim/core/opimtemplatebase.h
@@ -1,130 +1,122 @@
 /*
                              This file is part of the Opie Project
-                             Copyright (C) The Main Author <main-author@whereever.org>
+                             Copyright (C) Holger Freyther <zecke@handhelds.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OTEMPLATEBASE_H
 #define OTEMPLATEBASE_H
 
 /* OPIE */
 #include <opie2/opimrecord.h>
 
 /* QT */
 #include <qarray.h>
 
 namespace Opie {
 /**
  * Templates do not have a base class, This is why
  * we've this class
  * this is here to give us the possibility
  * to have a common base class
  * You may not want to use that interface internaly
  * POOR mans interface
  */
 class OPimBasePrivate;
 struct OPimBase {
     /**
      * return the rtti
      */
-    virtual int rtti()= 0;
+    virtual int rtti() const = 0;
     virtual OPimRecord* record()const = 0;
     virtual OPimRecord* record(int uid)const = 0;
     virtual bool add( const OPimRecord& ) = 0;
+    virtual bool add( const OPimRecord* ) = 0;
     virtual bool remove( int uid ) = 0;
     virtual bool remove( const OPimRecord& ) = 0;
     virtual void clear() = 0;
     virtual bool load() = 0;
     virtual bool save() = 0;
     virtual QArray<int> records()const = 0;
     /*
      * ADD editing here?
      * -zecke
      */
 private:
     OPimBasePrivate* d;     
 
 };
 /**
  * internal template base
  * T needs to implement the copy c'tor!!!
  */
 class OTemplateBasePrivate;
 template <class T = OPimRecord>
 class OTemplateBase : public OPimBase {
 public:
     enum CacheDirection { Forward=0, Reverse };
     OTemplateBase() {
     };
     virtual ~OTemplateBase() {
     }
     virtual T find( int uid )const = 0;
 
     /**
      * read ahead find
      */
     virtual T find( int uid, const QArray<int>& items,
                     uint current, CacheDirection dir = Forward )const = 0;
     virtual void cache( const T& )const = 0;
     virtual void setSaneCacheSize( int ) = 0;
 
-    /* reimplement of OPimBase */
-    int rtti();
     OPimRecord* record()const;
     OPimRecord* record(int uid )const;
     static T* rec();
     
 private:
     OTemplateBasePrivate *d;    
 };
 
-/*
- * implementation
- */
-template <class T>
-int
-OTemplateBase<T>::rtti() {
-    return T::rtti();
-}
+
 template <class T>
 OPimRecord* OTemplateBase<T>::record()const {
     T* t = new T;
     return t;
 }
 template <class T>
 OPimRecord* OTemplateBase<T>::record(int uid )const {
     T  t2 = find(uid );
     T* t1 = new T(t2);
 
     return t1;
 };
 template <class T>
 T* OTemplateBase<T>::rec() {
     return new T;
 }
 
 }
 
 #endif
diff --git a/libopie2/opiepim/core/otodoaccess.cpp b/libopie2/opiepim/core/otodoaccess.cpp
index 83750d5..6fa0089 100644
--- a/libopie2/opiepim/core/otodoaccess.cpp
+++ b/libopie2/opiepim/core/otodoaccess.cpp
@@ -1,93 +1,100 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #include <qdatetime.h>
 
 #include <qpe/alarmserver.h>
 
 // #include "otodoaccesssql.h"
 #include <opie2/otodoaccess.h>
 #include <opie2/obackendfactory.h>
+#include <opie2/opimresolver.h>
 
 namespace Opie {
 OPimTodoAccess::OPimTodoAccess( OPimTodoAccessBackend* end, enum Access )
     : QObject(), OPimAccessTemplate<OPimTodo>( end ),  m_todoBackEnd( end )
 {
 //     if (end == 0l )
 //         m_todoBackEnd = new OPimTodoAccessBackendSQL( QString::null);
 
 	// Zecke: Du musst hier noch fr das XML-Backend einen Appnamen bergeben !
         if (end == 0l )
 		m_todoBackEnd = OBackendFactory<OPimTodoAccessBackend>::Default ("todo", QString::null);
 
     setBackEnd( m_todoBackEnd );
 }
 OPimTodoAccess::~OPimTodoAccess() {
 //    qWarning("~OPimTodoAccess");
 }
 void OPimTodoAccess::mergeWith( const QValueList<OPimTodo>& list ) {
     QValueList<OPimTodo>::ConstIterator it;
     for ( it = list.begin(); it != list.end(); ++it ) {
         replace( (*it) );
     }
 }
 OPimTodoAccess::List OPimTodoAccess::effectiveToDos( const QDate& start,
                                                const QDate& end,
                                                bool includeNoDates ) {
     QArray<int> ints = m_todoBackEnd->effectiveToDos( start, end, includeNoDates );
 
     List lis( ints, this );
     return lis;
 }
 OPimTodoAccess::List OPimTodoAccess::effectiveToDos( const QDate& start,
                                                bool includeNoDates ) {
     return effectiveToDos( start, QDate::currentDate(),
                            includeNoDates );
 }
 OPimTodoAccess::List OPimTodoAccess::overDue() {
     List lis( m_todoBackEnd->overDue(), this );
     return lis;
 }
 /* sort order */
 OPimTodoAccess::List OPimTodoAccess::sorted( bool ascending, int sort,int filter, int cat ) {
     QArray<int> ints = m_todoBackEnd->sorted( ascending, sort,
                                       filter, cat );
     OPimTodoAccess::List list( ints, this );
     return list;
 }
 void OPimTodoAccess::removeAllCompleted() {
     m_todoBackEnd->removeAllCompleted();
 }
 QBitArray OPimTodoAccess::backendSupport( const QString& ) const{
     return m_todoBackEnd->supports();
 }
 bool OPimTodoAccess::backendSupports( int attr,  const QString& ar) const{
     return backendSupport(ar).testBit( attr );
 }
 
+
+int OPimTodoAccess::rtti() const
+{
+	return OPimResolver::TodoList;
+}
+
 }
diff --git a/libopie2/opiepim/core/otodoaccess.h b/libopie2/opiepim/core/otodoaccess.h
index 51f3793..3f5af30 100644
--- a/libopie2/opiepim/core/otodoaccess.h
+++ b/libopie2/opiepim/core/otodoaccess.h
@@ -1,136 +1,142 @@
 /*
                              This file is part of the Opie Project
                              Copyright (C) The Main Author <main-author@whereever.org>
               =.             Copyright (C) The Opie Team <opie-devel@handhelds.org>
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU Library General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 */
 #ifndef OPIE_TODO_ACCESS_H
 #define OPIE_TODO_ACCESS_H
 
 #include <qobject.h>
 #include <qvaluelist.h>
 
 #include <opie2/opimtodo.h>
 #include <opie2/otodoaccessbackend.h>
 #include <opie2/opimaccesstemplate.h>
 
 namespace Opie {
 
 /**
  * OPimTodoAccess
  * the class to get access to
  * the todolist
  */
 class OPimTodoAccess : public QObject, public OPimAccessTemplate<OPimTodo> {
     Q_OBJECT
 public:
     enum SortOrder { Completed = 0,
                      Priority,
                      Description,
                      Deadline };
     enum SortFilter{ Category =1,
                      OnlyOverDue= 2,
                      DoNotShowCompleted =4  };
     /**
      * if you use 0l
      * the default resource will be
      * picked up
      */
     OPimTodoAccess( OPimTodoAccessBackend* = 0l, enum Access acc = Random );
     ~OPimTodoAccess();
 
 
     /* our functions here */
     /**
      * include todos from start to end
      * includeNoDates whether or not to include
      * events with no dates
      */
     List effectiveToDos( const QDate& start,
                          const QDate& end,
                          bool includeNoDates = true );
 
     /**
      * start
      * end date taken from the currentDate()
      */
     List effectiveToDos( const QDate& start,
                          bool includeNoDates = true );
 
 
     /**
      * return overdue OPimTodos
      */
     List overDue();
 
     /**
      *
      */
     List sorted( bool ascending, int sortOrder, int sortFilter, int cat );
 
     /**
      * merge a list of OPimTodos into
      * the resource
      */
     void mergeWith( const QValueList<OPimTodo>& );
 
     /**
      * delete all already completed items
      */
     void removeAllCompleted();
 
     /**
      * request information about what a backend supports.
      * Supports in the sense of beeing able to store.
      * This is related to the enum in OPimTodo
      *
      * @param backend Will be used in the future when we support multiple backend
      */
     QBitArray backendSupport( const QString& backend = QString::null )const;
 
     /**
      * see above but for a specefic attribute. This method was added for convience
      * @param attr The attribute to be queried for
      * @param backend Will be used in the future when we support multiple backends
      */
     bool backendSupports( int attr, const QString& backend = QString::null  )const;
+
+
+    /** 
+     * Return identification of used records
+     */
+    int rtti() const;
 signals:
     /**
      * if the OPimTodoAccess was changed
      */
     void changed( const OPimTodoAccess* );
     void changed( const OPimTodoAccess*, int uid );
     void added( const OPimTodoAccess*,  int uid );
     void removed( const OPimTodoAccess*, int uid );
 private:
     int m_cat;
     OPimTodoAccessBackend* m_todoBackEnd;
     class OPimTodoAccessPrivate;
     OPimTodoAccessPrivate* d;
 };
 
 }
 
 #endif