Finishing implementation of sql-backend for datebook. But I have to

port the PIM datebook application to use it, before I could debug the
whole stuff.
Thus, PIM-Database backend is finished, but highly experimental. And some
parts are still generic. For instance, the "queryByExample()" methods are
not (or not fully) implemented. Todo: custom-entries not stored.
The big show stopper: matchRegExp() (needed by OpieSearch) needs regular
expression search in the database, which is not supported by sqlite !
Therefore we need either an extended sqlite or a workaround which would
be very slow and memory consuming..

1 files changed, 13 insertions, 0 deletions

diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index ec05e77..9b31957 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -16,128 +16,137 @@ int OCalendarHelper::week( const QDate& date) {
     // month. Equals the "row" is is in in the month view
     int week = 1;
     QDate tmp( date.year(), date.month(), 1 );
     if ( date.dayOfWeek() < tmp.dayOfWeek() )
         ++week;
 
     week += ( date.day() - 1 ) / 7;
 
     return week;
 }
 int OCalendarHelper::ocurrence( const QDate& date) {
     // calculates the number of occurrances of this day of the
     // week till the given date (e.g 3rd Wednesday of the month)
     return ( date.day() - 1 ) / 7 + 1;
 }
 int OCalendarHelper::dayOfWeek( char day ) {
     int dayOfWeek = 1;
     char i = ORecur::MON;
     while ( !( i & day ) && i <= ORecur::SUN ) {
         i <<= 1;
         ++dayOfWeek;
     }
     return dayOfWeek;
 }
 int OCalendarHelper::monthDiff( const QDate& first, const QDate& second ) {
     return ( second.year() - first.year() ) * 12 +
         second.month() - first.month();
 }
 
 struct OEvent::Data : public QShared {
     Data() : QShared() {
         child = 0;
         recur = 0;
         manager = 0;
         isAllDay = false;
         parent = 0;
     }
     ~Data() {
         delete manager;
         delete recur;
     }
     QString description;
     QString location;
     OPimNotifyManager* manager;
     ORecur* recur;
     QString note;
     QDateTime created;
     QDateTime start;
     QDateTime end;
     bool isAllDay : 1;
     QString timezone;
     QArray<int>* child;
     int parent;
 };
 
 OEvent::OEvent( int uid )
     : OPimRecord( uid ) {
     data = new Data;
 }
 OEvent::OEvent( const OEvent& ev)
     : OPimRecord( ev ), data( ev.data )
 {
     data->ref();
 }
+
+OEvent::OEvent( const QMap<int, QString> map )
+    : OPimRecord( 0 )
+{
+	data = new Data;
+
+	fromMap( map );
+}
+
 OEvent::~OEvent() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 OEvent& OEvent::operator=( const OEvent& ev) {
     if ( this == &ev ) return  *this;
 
     OPimRecord::operator=( ev );
     ev.data->ref();
     deref();
     data = ev.data;
 
 
     return *this;
 }
 QString OEvent::description()const {
     return data->description;
 }
 void OEvent::setDescription( const QString& description ) {
     changeOrModify();
     data->description = description;
 }
 void OEvent::setLocation( const QString& loc ) {
     changeOrModify();
     data->location = loc;
 }
 QString OEvent::location()const {
     return data->location;
 }
 OPimNotifyManager &OEvent::notifiers()const {
     // I hope we can skip the changeOrModify here
     // the notifier should take care of it
     // and OPimNotify is shared too
     if (!data->manager )
         data->manager = new OPimNotifyManager;
 
     return *data->manager;
 }
 bool OEvent::hasNotifiers()const {
     if (!data->manager )
         return false;
     if (data->manager->reminders().isEmpty() &&
         data->manager->alarms().isEmpty() )
         return false;
 
     return true;
 }
 ORecur OEvent::recurrence()const {
     if (!data->recur)
         data->recur = new ORecur;
 
     return *data->recur;
 }
 void OEvent::setRecurrence( const ORecur& rec) {
     changeOrModify();
     if (data->recur )
         (*data->recur) = rec;
     else
         data->recur = new ORecur( rec );
 }
 bool OEvent::hasRecurrence()const {
     if (!data->recur ) return false;
@@ -342,128 +351,132 @@ void OEvent::changeOrModify() {
         d2->isAllDay = data->isAllDay;
         d2->timezone = data->timezone;
         d2->parent = data->parent;
 
         if ( data->child ) {
             d2->child = new QArray<int>( *data->child );
             d2->child->detach();
         }
 
         data = d2;
     }
 }
 void OEvent::deref() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 // Exporting Event data to map. Using the same
 // encoding as ODateBookAccessBackend_xml does..
 // Thus, we could remove the stuff there and use this
 // for it and for all other places..
 // Encoding should happen at one place, only ! (eilers)
 QMap<int, QString> OEvent::toMap()const {
     QMap<int, QString> retMap;
 
     retMap.insert( OEvent::FUid, QString::number( uid() ) );
     retMap.insert( OEvent::FCategories, Qtopia::escapeString( Qtopia::Record::idsToString( categories() ) ));
     retMap.insert( OEvent::FDescription, Qtopia::escapeString( description() ) );
     retMap.insert( OEvent::FLocation, Qtopia::escapeString( location() ) );
     retMap.insert( OEvent::FType, isAllDay() ? "AllDay" : "" );
     OPimAlarm alarm = notifiers().alarms()[0];
     retMap.insert( OEvent::FAlarm, QString::number( alarm.dateTime().secsTo(  startDateTime() ) / 60 ) );
     retMap.insert( OEvent::FSound, (alarm.sound() == OPimAlarm::Loud) ? "loud" : "silent" );
 
     OTimeZone zone(  timeZone().isEmpty() ? OTimeZone::current() : timeZone() );
     retMap.insert( OEvent::FStart, QString::number( zone.fromUTCDateTime( zone.toDateTime(  startDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FEnd, QString::number( zone.fromUTCDateTime( zone.toDateTime(  endDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FNote, Qtopia::escapeString( note() ) );
     retMap.insert( OEvent::FTimeZone, timeZone().isEmpty() ? QString( "None" ) : timeZone() );
     if( parent() )
 	    retMap.insert( OEvent::FRecParent, QString::number( parent() ) );
     if( children().count() ){
             QArray<int> childr = children();
 	    QString buf;
             for ( uint i = 0; i < childr.count(); i++ ) {
 		    if ( i != 0 ) buf += " ";
 		    buf += QString::number( childr[i] );
             }	    
 	    retMap.insert( OEvent::FRecChildren, buf );
     }
     
     // Add recurrence stuff
     if( hasRecurrence() ){
 	    ORecur recur = recurrence();
 	    QMap<int, QString> recFields = recur.toMap();
 	    retMap.insert( OEvent::FRType, recFields[ORecur::RType] );
 	    retMap.insert( OEvent::FRWeekdays, recFields[ORecur::RWeekdays] );
 	    retMap.insert( OEvent::FRPosition, recFields[ORecur::RPosition] );
 	    retMap.insert( OEvent::FRFreq, recFields[ORecur::RFreq] );
 	    retMap.insert( OEvent::FRHasEndDate, recFields[ORecur::RHasEndDate] );
 	    retMap.insert( OEvent::FREndDate, recFields[ORecur::EndDate] );
 	    retMap.insert( OEvent::FRCreated, recFields[ORecur::Created] );
 	    retMap.insert( OEvent::FRExceptions, recFields[ORecur::Exceptions] );
+    } else {
+	    ORecur recur = recurrence();
+	    QMap<int, QString> recFields = recur.toMap();
+	    retMap.insert( OEvent::FRType, recFields[ORecur::RType] );
     }
    
     return retMap;
 }
 
 void OEvent::fromMap( const QMap<int, QString>& map )
 {
 
 	// We just want to set the UID if it is really stored.
 	if ( !map[OEvent::FUid].isEmpty() )
 		setUid( map[OEvent::FUid].toInt() );
 
 	setCategories( idsFromString( map[OEvent::FCategories] ) );
 	setDescription( map[OEvent::FDescription] );
 	setLocation( map[OEvent::FLocation] );
 
 	if ( map[OEvent::FType] == "AllDay" )
 		setAllDay( true );
 	else
 		setAllDay( false );
 	
 	int alarmTime = -1;
 	if( !map[OEvent::FAlarm].isEmpty() )
 		alarmTime = map[OEvent::FAlarm].toInt();
 
 	int sound = ( ( map[OEvent::FSound] == "loud" ) ? OPimAlarm::Loud : OPimAlarm::Silent );
 	if ( ( alarmTime != -1 )  ){
 		QDateTime dt = startDateTime().addSecs( -1*alarmTime*60 );
 		OPimAlarm al( sound ,  dt  );
 		notifiers().add( al );
 	}
 	if ( !map[OEvent::FTimeZone].isEmpty() && ( map[OEvent::FTimeZone] != "None" ) ){
 		setTimeZone( map[OEvent::FTimeZone] );
 	}
 	
 	time_t start = (time_t) map[OEvent::FStart].toLong();
 	time_t end   = (time_t) map[OEvent::FEnd].toLong();
 
 	/* AllDay is always in UTC */
 	if ( isAllDay() ) {
 		OTimeZone utc = OTimeZone::utc();
 		setStartDateTime( utc.fromUTCDateTime( start ) );
 		setEndDateTime  ( utc.fromUTCDateTime( end   ) );
 		setTimeZone( "UTC"); // make sure it is really utc
 	}else {
 		/* to current date time */
 		// qWarning(" Start is %d", start );
 		OTimeZone zone( timeZone().isEmpty() ? OTimeZone::current() : timeZone() );
 		QDateTime date = zone.toDateTime( start );
 		qWarning(" Start is %s", date.toString().latin1() );
 		setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
 
 		date = zone.toDateTime( end );
 		setEndDateTime  ( zone.toDateTime( date, OTimeZone::current() ) );
 	}
 	
 	if ( !map[OEvent::FRecParent].isEmpty() )
 		setParent( map[OEvent::FRecParent].toInt() );
 
 	if ( !map[OEvent::FRecChildren].isEmpty() ){
 		QStringList list = QStringList::split(' ', map[OEvent::FRecChildren] );
 		for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
 			addChild( (*it).toInt() );
 		}