Implement saving of events

Implement the ExceptionList
Add Children and parent to OEvent
Make  ORecur honor exceptions
Extend the test app to add and save

11 files changed, 631 insertions, 35 deletions

diff --git a/libopie/pim/odatebookaccessbackend_xml.cpp b/libopie/pim/odatebookaccessbackend_xml.cpp
index a4c514b..5239d84 100644
--- a/libopie/pim/odatebookaccessbackend_xml.cpp
+++ b/libopie/pim/odatebookaccessbackend_xml.cpp
@@ -3,2 +3,5 @@
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <sys/types.h>
@@ -14,2 +17,3 @@
 #include <qtopia/stringutil.h>
+#include <qtopia/timeconversion.h>
 
@@ -32,7 +36,7 @@ namespace {
     enum Attribute{
-        	FDescription = 0,
-	FLocation,
-	FCategories,
-	FUid,
-	FType,
+        FDescription = 0,
+        FLocation,
+        FCategories,
+        FUid,
+        FType,
 	FAlarm,
@@ -48,4 +52,85 @@ namespace {
 	FNote,
-	FCreated
+	FCreated,
+        FTimeZone,
+        FRecParent,
+        FRecChildren,
+        FExceptions
     };
+    inline void save( const OEvent& ev, QString& buf ) {
+        buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\"";
+        if (!ev.location().isEmpty() )
+            buf += " location=\"" + Qtopia::escapeString(ev.location() ) + "\"";
+
+        buf += " categories=\""+ Qtopia::escapeString( Qtopia::Record::idsToString( ev.categories() ) ) + "\"";
+        buf += " uid=\"" + QString::number( ev.uid() ) + "\"";
+
+        if (ev.isAllDay() )
+            buf += " type=\"AllDay\"";
+
+        if (ev.hasNotifiers() ) {
+            OPimAlarm alarm = ev.notifiers().alarms()[0]; // take only the first
+            int minutes = alarm.dateTime().secsTo( ev.startDateTime() ) / 60;
+            buf += " alarm=\"" + QString::number(minutes) + "\" sound=\"";
+            if ( alarm.sound() == OPimAlarm::Loud )
+                buf += "loud";
+            else
+                buf += "silent";
+            buf += "\"";
+        }
+        if ( ev.hasRecurrence() ) {
+            buf += ev.recurrence().toString();
+        }
+
+        /*
+         * fscking timezones :) well, we'll first convert
+         * the QDateTime to a QDateTime in UTC time
+         * and then we'll create a nice time_t
+         */
+        OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
+        buf += " start=\"" + QString::number( zone.fromUTCDateTime( zone.toDateTime( ev.startDateTime(), OTimeZone::utc() ) ) )  + "\"";
+        buf += " end=\""   + QString::number( zone.fromUTCDateTime( zone.toDateTime( ev.endDateTime()  , OTimeZone::utc() ) ) )   + "\"";
+        if (!ev.note().isEmpty() ) {
+            buf += " note=\"" + Qtopia::escapeString( ev.note() ) + "\"";
+        }
+
+        buf += " timezone=\"";
+        if ( ev.timeZone().isEmpty() )
+            buf += "None";
+        else
+            buf += ev.timeZone();
+
+        if (ev.parent() != 0 ) {
+            buf += " recparent=\""+QString::number(ev.parent() )+"\"";
+        }
+
+        if (ev.children().count() != 0 ) {
+            QArray<int> children = ev.children();
+            buf += " recchildren=\"";
+            for ( uint i = 0; i < children.count(); i++ ) {
+                if ( i != 0 ) buf += " ";
+                buf += QString::number( children[i] );
+            }
+            buf+= "\"";
+        }
+
+        // skip custom writing
+    }
+
+    inline bool forAll( const QMap<int, OEvent>& list, QFile& file ) {
+        QMap<int, OEvent>::ConstIterator it;
+        QString buf;
+        QCString str;
+        int total_written;
+        for ( it = list.begin(); it != list.end(); ++it ) {
+            buf = "<event";
+            save( it.data(), buf );
+            buf += " />\n";
+            str = buf.utf8();
+
+            total_written = file.writeBlock(str.data(), str.length() );
+            if ( total_written != int(str.length() ) )
+                return false;
+        }
+        return true;
+    }
 }
@@ -68,5 +153,50 @@ bool ODateBookAccessBackend_XML::reload() {
 bool ODateBookAccessBackend_XML::save() {
-    if (!m_changed) return true;
-    m_changed = false;
+    qWarning("going to save now");
+//    if (!m_changed) return true;
+
+    int total_written;
+    QString strFileNew = m_name + ".new";
+
+    QFile f( strFileNew );
+    if (!f.open( IO_WriteOnly | IO_Raw ) ) return false;
+
+    QString buf( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
+    buf += "<!DOCTYPE DATEBOOK><DATEBOOK>\n";
+    buf += "<events>\n";
+    QCString str = buf.utf8();
+    total_written = f.writeBlock( str.data(), str.length() );
+    if ( total_written != int(str.length() ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
 
+    if (!forAll( m_raw, f ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
+    if (!forAll( m_rep, f ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
+
+    buf = "</events>\n</DATEBOOK>\n";
+    str = buf.utf8();
+    total_written = f.writeBlock( str.data(), str.length() );
+    if ( total_written != int(str.length() ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
+    f.close();
+
+    exit(0);
+    if ( ::rename( strFileNew, m_name ) < 0 ) {
+        QFile::remove( strFileNew );
+        return false;
+    }
+
+    m_changed = false;
     return true;
@@ -185,3 +315,3 @@ bool ODateBookAccessBackend_XML::loadFile() {
 
-    QAsciiDict<int> dict(FCreated+1);
+    QAsciiDict<int> dict(FExceptions+1);
     dict.setAutoDelete( true );
@@ -204,2 +334,6 @@ bool ODateBookAccessBackend_XML::loadFile() {
     dict.insert( "created", new int(FCreated) );
+    dict.insert( "recparent", new int(FRecParent) );
+    dict.insert( "recchildren", new int(FRecChildren) );
+    dict.insert( "exceptions", new int(FExceptions) );
+    dict.insert( "timezone", new int(FTimeZone) );
 
@@ -291,6 +425,11 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
         ev.setEndDateTime  ( utc.fromUTCDateTime( end   ) );
+        ev.setTimeZone( "UTC"); // make sure it is really utc
     }else {
+        /* to current date time */
         OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
-        ev.setStartDateTime( zone.toDateTime( start ) );
-        ev.setEndDateTime  ( zone.toDateTime( end   ) );
+        QDateTime date = zone.toDateTime( start );
+        ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
+
+        date = zone.toDateTime( end );
+        ev.setEndDateTime  ( zone.toDateTime( date, OTimeZone::current()   ) );
     }
@@ -391,2 +530,25 @@ void ODateBookAccessBackend_XML::setField( OEvent& e, int id, const QString& val
         break;
+    case FRecParent:
+        e.setParent( value.toInt() );
+        break;
+    case FRecChildren:{
+        QStringList list = QStringList::split(' ', value );
+        for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+            e.addChild( (*it).toInt() );
+        }
+    }
+        break;
+    case FExceptions:{
+        QStringList list = QStringList::split(' ', value );
+        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+            QDate date( (*it).left(4).toInt(), (*it).mid(4, 2).toInt(), (*it).right(2).toInt() );
+            qWarning("adding exception %s", date.toString().latin1() );
+            recur()->exceptions().append( date );
+        }
+    }
+        break;
+    case FTimeZone:
+        if ( value != "None" )
+            e.setTimeZone( value );
+        break;
     default:
diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index ada596c..c3eeee2 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -44,2 +44,3 @@ struct OEvent::Data : public QShared {
     Data() : QShared() {
+        child = 0;
         recur = 0;
@@ -47,2 +48,3 @@ struct OEvent::Data : public QShared {
         isAllDay = false;
+        parent = 0;
     }
@@ -62,2 +64,4 @@ struct OEvent::Data : public QShared {
     QString timezone;
+    QArray<int>* child;
+    int parent;
 };
@@ -104,3 +108,3 @@ QString OEvent::location()const {
 }
-OPimNotifyManager &OEvent::notifiers() {
+OPimNotifyManager &OEvent::notifiers()const {
     // I hope we can skip the changeOrModify here
@@ -114,3 +118,9 @@ OPimNotifyManager &OEvent::notifiers() {
 bool OEvent::hasNotifiers()const {
-    return  ( data->manager);
+    if (!data->manager )
+        return false;
+    if (data->manager->reminders().isEmpty() &&
+        data->manager->alarms().isEmpty() )
+        return false;
+
+    return true;
 }
@@ -199,2 +209,3 @@ void OEvent::setTimeZone( const QString& tz ) {
 QString OEvent::timeZone()const {
+    if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
@@ -241,2 +252,7 @@ void OEvent::changeOrModify() {
         d2->timezone = data->timezone;
+        d2->parent = data->parent;
+        d2->child = data->child;
+
+        if (d2->child )
+            d2->child->detach();
 
@@ -258,4 +274,46 @@ QMap<QString, QString> OEvent::toExtraMap()const {
 }
+int OEvent::parent()const {
+    return data->parent;
+}
+void OEvent::setParent( int uid ) {
+    changeOrModify();
+    data->parent = uid;
+}
+QArray<int> OEvent::children() const{
+    if (!data->child) return QArray<int>();
+    else
+        return data->child->copy();
+}
+void OEvent::setChildren( const QArray<int>& arr ) {
+    changeOrModify();
+    if (data->child) delete data->child;
 
-
+    data->child = new QArray<int>( arr );
+    data->child->detach();
+}
+void OEvent::addChild( int uid ) {
+    changeOrModify();
+    if (!data->child ) {
+        data->child = new QArray<int>(1);
+        (*data->child)[0] = uid;
+    }else{
+        int count = data->child->count();
+        data->child->resize( count + 1 );
+        (*data->child)[count] = uid;
+    }
+}
+void OEvent::removeChild( int uid ) {
+    if (!data->child || !data->child->contains( uid ) ) return;
+    changeOrModify();
+    QArray<int> newAr( data->child->count() - 1 );
+    int j = 0;
+    uint count = data->child->count();
+    for ( uint i = 0; i < count; i++ ) {
+        if ( (*data->child)[i] != uid ) {
+            newAr[j] = (*data->child)[i];
+            j++;
+        }
+    }
+    (*data->child) = newAr;
+}
 struct OEffectiveEvent::Data : public QShared {
diff --git a/libopie/pim/oevent.h b/libopie/pim/oevent.h
index c718e2e..585515c 100644
--- a/libopie/pim/oevent.h
+++ b/libopie/pim/oevent.h
@@ -63,3 +63,3 @@ public:
     bool hasNotifiers()const;
-    OPimNotifyManager &notifiers();
+    OPimNotifyManager &notifiers()const;
 
@@ -101,3 +101,11 @@ public:
 
+    /** For exception to recurrence here is a list of children...  */
+    QArray<int> children()const;
+    void setChildren( const QArray<int>& );
+    void addChild( int uid );
+    void removeChild( int uid );
 
+    /** return the parent OEvent */
+    int parent()const;
+    void setParent( int uid );
 
diff --git a/libopie/pim/orecur.cpp b/libopie/pim/orecur.cpp
index e6a4787..e3b45b4 100644
--- a/libopie/pim/orecur.cpp
+++ b/libopie/pim/orecur.cpp
@@ -1 +1,3 @@
+#include <time.h>
+
 #include <qshared.h>
@@ -4,2 +6,3 @@
 
+#include "otimezone.h"
 #include "orecur.h"
@@ -83,2 +86,10 @@ bool ORecur::doesRecur( const QDate& date ) {
 bool ORecur::nextOcurrence( const QDate& from, QDate& next ) {
+    bool stillLooking;
+    stillLooking  = p_nextOccurrence( from, next );
+    while ( stillLooking && data->list.contains(next) )
+        stillLooking = p_nextOccurrence( next.addDays(1), next );
+
+    return stillLooking;
+}
+bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
 
@@ -97,3 +108,3 @@ bool ORecur::nextOcurrence( const QDate& from, QDate& next ) {
 
-    if (start() >= from) {
+    if (start() >= from  ) {
 	next = start();
@@ -445,2 +456,55 @@ void ORecur::checkOrModify() {
 }
+QString ORecur::toString()const {
+    QString buf;
+
+    buf += " rtype=\"";
+    switch ( data->type ) {
+    case ORecur::Daily:
+        buf += "Daily";
+        break;
+    case ORecur::Weekly:
+        buf += "Weekly";
+        break;
+    case ORecur::MonthlyDay:
+        buf += "MonthlyDay";
+        break;
+    case ORecur::MonthlyDate:
+        buf += "MonthlyDate";
+        break;
+    case ORecur::Yearly:
+        buf += "Yearly";
+        break;
+    default:
+        buf += "NoRepeat";
+        break;
+    }
+    buf += "\"";
+    if (data->days > 0 )
+	buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\"";
+    if ( data->pos != 0 )
+	buf += " rposition=\"" + QString::number(data->pos ) + "\"";
+
+    buf += " rfreq=\"" + QString::number( data->freq ) + "\"";
+    buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\"";
+    if ( data->hasEnd )
+	buf += " enddt=\""
+	       + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) )
+	       + "\"";
+    buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\"";
+
+    if ( data->list.isEmpty() ) return buf;
+    // save exceptions list here!!
+    ExceptionList::ConstIterator it;
+    ExceptionList list = data->list;
+    buf += " exceptions=\"";
+    QDate date;
+    for ( it = list.begin(); it != list.end(); ++it ) {
+        date = (*it);
+        if ( it != list.begin() ) buf += " ";
+
+        buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
+    }
+    buf += "\"";
 
+    return buf;
+}
diff --git a/libopie/pim/orecur.h b/libopie/pim/orecur.h
index 1e0014b..b214b3f 100644
--- a/libopie/pim/orecur.h
+++ b/libopie/pim/orecur.h
@@ -75,3 +75,7 @@ public:
     void setService( const QString& ser );
+
+    /* almost internal */
+    QString toString()const;
 private:
+    bool p_nextOccurrence( const QDate& from, QDate& next );
     void deref();
diff --git a/libopie/pim/test/oevent_test.cpp b/libopie/pim/test/oevent_test.cpp
index 6f04995..247b83b 100644
--- a/libopie/pim/test/oevent_test.cpp
+++ b/libopie/pim/test/oevent_test.cpp
@@ -7,8 +7,8 @@ int main(int argc, char* argv ) {
     OEvent ev;
-    ev.setUid( 20 );
+//    ev.setUid( 20 );
 
-    ev.setDescription( "Foo" );
+    ev.setDescription( "Foo Descsfewrf" );
 
     OEvent ev2 = ev;
-    ev2.setDescription("Foo2");
+    ev2.setDescription("Foo3");
     qWarning("%s", ev2.description().latin1() );
@@ -22,2 +22,3 @@ int main(int argc, char* argv ) {
     qWarning("%s", ev2.startDateTimeInZone().toString().latin1() );
+    qWarning("%d %d", ev.isAllDay(), ev2.isAllDay() );
 
@@ -47,2 +48,5 @@ int main(int argc, char* argv ) {
     }
+    ev.setUid( 1 );
+    acc.add( ev );
+    acc.save();
 
diff --git a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
index a4c514b..5239d84 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend_xml.cpp
@@ -3,2 +3,5 @@
 
+#include <stdio.h>
+#include <stdlib.h>
+
 #include <sys/types.h>
@@ -14,2 +17,3 @@
 #include <qtopia/stringutil.h>
+#include <qtopia/timeconversion.h>
 
@@ -32,7 +36,7 @@ namespace {
     enum Attribute{
-        	FDescription = 0,
-	FLocation,
-	FCategories,
-	FUid,
-	FType,
+        FDescription = 0,
+        FLocation,
+        FCategories,
+        FUid,
+        FType,
 	FAlarm,
@@ -48,4 +52,85 @@ namespace {
 	FNote,
-	FCreated
+	FCreated,
+        FTimeZone,
+        FRecParent,
+        FRecChildren,
+        FExceptions
     };
+    inline void save( const OEvent& ev, QString& buf ) {
+        buf += " description=\"" + Qtopia::escapeString(ev.description() ) + "\"";
+        if (!ev.location().isEmpty() )
+            buf += " location=\"" + Qtopia::escapeString(ev.location() ) + "\"";
+
+        buf += " categories=\""+ Qtopia::escapeString( Qtopia::Record::idsToString( ev.categories() ) ) + "\"";
+        buf += " uid=\"" + QString::number( ev.uid() ) + "\"";
+
+        if (ev.isAllDay() )
+            buf += " type=\"AllDay\"";
+
+        if (ev.hasNotifiers() ) {
+            OPimAlarm alarm = ev.notifiers().alarms()[0]; // take only the first
+            int minutes = alarm.dateTime().secsTo( ev.startDateTime() ) / 60;
+            buf += " alarm=\"" + QString::number(minutes) + "\" sound=\"";
+            if ( alarm.sound() == OPimAlarm::Loud )
+                buf += "loud";
+            else
+                buf += "silent";
+            buf += "\"";
+        }
+        if ( ev.hasRecurrence() ) {
+            buf += ev.recurrence().toString();
+        }
+
+        /*
+         * fscking timezones :) well, we'll first convert
+         * the QDateTime to a QDateTime in UTC time
+         * and then we'll create a nice time_t
+         */
+        OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
+        buf += " start=\"" + QString::number( zone.fromUTCDateTime( zone.toDateTime( ev.startDateTime(), OTimeZone::utc() ) ) )  + "\"";
+        buf += " end=\""   + QString::number( zone.fromUTCDateTime( zone.toDateTime( ev.endDateTime()  , OTimeZone::utc() ) ) )   + "\"";
+        if (!ev.note().isEmpty() ) {
+            buf += " note=\"" + Qtopia::escapeString( ev.note() ) + "\"";
+        }
+
+        buf += " timezone=\"";
+        if ( ev.timeZone().isEmpty() )
+            buf += "None";
+        else
+            buf += ev.timeZone();
+
+        if (ev.parent() != 0 ) {
+            buf += " recparent=\""+QString::number(ev.parent() )+"\"";
+        }
+
+        if (ev.children().count() != 0 ) {
+            QArray<int> children = ev.children();
+            buf += " recchildren=\"";
+            for ( uint i = 0; i < children.count(); i++ ) {
+                if ( i != 0 ) buf += " ";
+                buf += QString::number( children[i] );
+            }
+            buf+= "\"";
+        }
+
+        // skip custom writing
+    }
+
+    inline bool forAll( const QMap<int, OEvent>& list, QFile& file ) {
+        QMap<int, OEvent>::ConstIterator it;
+        QString buf;
+        QCString str;
+        int total_written;
+        for ( it = list.begin(); it != list.end(); ++it ) {
+            buf = "<event";
+            save( it.data(), buf );
+            buf += " />\n";
+            str = buf.utf8();
+
+            total_written = file.writeBlock(str.data(), str.length() );
+            if ( total_written != int(str.length() ) )
+                return false;
+        }
+        return true;
+    }
 }
@@ -68,5 +153,50 @@ bool ODateBookAccessBackend_XML::reload() {
 bool ODateBookAccessBackend_XML::save() {
-    if (!m_changed) return true;
-    m_changed = false;
+    qWarning("going to save now");
+//    if (!m_changed) return true;
+
+    int total_written;
+    QString strFileNew = m_name + ".new";
+
+    QFile f( strFileNew );
+    if (!f.open( IO_WriteOnly | IO_Raw ) ) return false;
+
+    QString buf( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" );
+    buf += "<!DOCTYPE DATEBOOK><DATEBOOK>\n";
+    buf += "<events>\n";
+    QCString str = buf.utf8();
+    total_written = f.writeBlock( str.data(), str.length() );
+    if ( total_written != int(str.length() ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
 
+    if (!forAll( m_raw, f ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
+    if (!forAll( m_rep, f ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
+
+    buf = "</events>\n</DATEBOOK>\n";
+    str = buf.utf8();
+    total_written = f.writeBlock( str.data(), str.length() );
+    if ( total_written != int(str.length() ) ) {
+        f.close();
+        QFile::remove( strFileNew );
+        return false;
+    }
+    f.close();
+
+    exit(0);
+    if ( ::rename( strFileNew, m_name ) < 0 ) {
+        QFile::remove( strFileNew );
+        return false;
+    }
+
+    m_changed = false;
     return true;
@@ -185,3 +315,3 @@ bool ODateBookAccessBackend_XML::loadFile() {
 
-    QAsciiDict<int> dict(FCreated+1);
+    QAsciiDict<int> dict(FExceptions+1);
     dict.setAutoDelete( true );
@@ -204,2 +334,6 @@ bool ODateBookAccessBackend_XML::loadFile() {
     dict.insert( "created", new int(FCreated) );
+    dict.insert( "recparent", new int(FRecParent) );
+    dict.insert( "recchildren", new int(FRecChildren) );
+    dict.insert( "exceptions", new int(FExceptions) );
+    dict.insert( "timezone", new int(FTimeZone) );
 
@@ -291,6 +425,11 @@ void ODateBookAccessBackend_XML::finalizeRecord( OEvent& ev ) {
         ev.setEndDateTime  ( utc.fromUTCDateTime( end   ) );
+        ev.setTimeZone( "UTC"); // make sure it is really utc
     }else {
+        /* to current date time */
         OTimeZone zone( ev.timeZone().isEmpty() ? OTimeZone::current() : ev.timeZone() );
-        ev.setStartDateTime( zone.toDateTime( start ) );
-        ev.setEndDateTime  ( zone.toDateTime( end   ) );
+        QDateTime date = zone.toDateTime( start );
+        ev.setStartDateTime( zone.toDateTime( date, OTimeZone::current() ) );
+
+        date = zone.toDateTime( end );
+        ev.setEndDateTime  ( zone.toDateTime( date, OTimeZone::current()   ) );
     }
@@ -391,2 +530,25 @@ void ODateBookAccessBackend_XML::setField( OEvent& e, int id, const QString& val
         break;
+    case FRecParent:
+        e.setParent( value.toInt() );
+        break;
+    case FRecChildren:{
+        QStringList list = QStringList::split(' ', value );
+        for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+            e.addChild( (*it).toInt() );
+        }
+    }
+        break;
+    case FExceptions:{
+        QStringList list = QStringList::split(' ', value );
+        for (QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
+            QDate date( (*it).left(4).toInt(), (*it).mid(4, 2).toInt(), (*it).right(2).toInt() );
+            qWarning("adding exception %s", date.toString().latin1() );
+            recur()->exceptions().append( date );
+        }
+    }
+        break;
+    case FTimeZone:
+        if ( value != "None" )
+            e.setTimeZone( value );
+        break;
     default:
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp
index e6a4787..e3b45b4 100644
--- a/libopie2/opiepim/core/orecur.cpp
+++ b/libopie2/opiepim/core/orecur.cpp
@@ -1 +1,3 @@
+#include <time.h>
+
 #include <qshared.h>
@@ -4,2 +6,3 @@
 
+#include "otimezone.h"
 #include "orecur.h"
@@ -83,2 +86,10 @@ bool ORecur::doesRecur( const QDate& date ) {
 bool ORecur::nextOcurrence( const QDate& from, QDate& next ) {
+    bool stillLooking;
+    stillLooking  = p_nextOccurrence( from, next );
+    while ( stillLooking && data->list.contains(next) )
+        stillLooking = p_nextOccurrence( next.addDays(1), next );
+
+    return stillLooking;
+}
+bool ORecur::p_nextOccurrence( const QDate& from, QDate& next ) {
 
@@ -97,3 +108,3 @@ bool ORecur::nextOcurrence( const QDate& from, QDate& next ) {
 
-    if (start() >= from) {
+    if (start() >= from  ) {
 	next = start();
@@ -445,2 +456,55 @@ void ORecur::checkOrModify() {
 }
+QString ORecur::toString()const {
+    QString buf;
+
+    buf += " rtype=\"";
+    switch ( data->type ) {
+    case ORecur::Daily:
+        buf += "Daily";
+        break;
+    case ORecur::Weekly:
+        buf += "Weekly";
+        break;
+    case ORecur::MonthlyDay:
+        buf += "MonthlyDay";
+        break;
+    case ORecur::MonthlyDate:
+        buf += "MonthlyDate";
+        break;
+    case ORecur::Yearly:
+        buf += "Yearly";
+        break;
+    default:
+        buf += "NoRepeat";
+        break;
+    }
+    buf += "\"";
+    if (data->days > 0 )
+	buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\"";
+    if ( data->pos != 0 )
+	buf += " rposition=\"" + QString::number(data->pos ) + "\"";
+
+    buf += " rfreq=\"" + QString::number( data->freq ) + "\"";
+    buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\"";
+    if ( data->hasEnd )
+	buf += " enddt=\""
+	       + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) )
+	       + "\"";
+    buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\"";
+
+    if ( data->list.isEmpty() ) return buf;
+    // save exceptions list here!!
+    ExceptionList::ConstIterator it;
+    ExceptionList list = data->list;
+    buf += " exceptions=\"";
+    QDate date;
+    for ( it = list.begin(); it != list.end(); ++it ) {
+        date = (*it);
+        if ( it != list.begin() ) buf += " ";
+
+        buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
+    }
+    buf += "\"";
 
+    return buf;
+}
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h
index 1e0014b..b214b3f 100644
--- a/libopie2/opiepim/core/orecur.h
+++ b/libopie2/opiepim/core/orecur.h
@@ -75,3 +75,7 @@ public:
     void setService( const QString& ser );
+
+    /* almost internal */
+    QString toString()const;
 private:
+    bool p_nextOccurrence( const QDate& from, QDate& next );
     void deref();
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index ada596c..c3eeee2 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -44,2 +44,3 @@ struct OEvent::Data : public QShared {
     Data() : QShared() {
+        child = 0;
         recur = 0;
@@ -47,2 +48,3 @@ struct OEvent::Data : public QShared {
         isAllDay = false;
+        parent = 0;
     }
@@ -62,2 +64,4 @@ struct OEvent::Data : public QShared {
     QString timezone;
+    QArray<int>* child;
+    int parent;
 };
@@ -104,3 +108,3 @@ QString OEvent::location()const {
 }
-OPimNotifyManager &OEvent::notifiers() {
+OPimNotifyManager &OEvent::notifiers()const {
     // I hope we can skip the changeOrModify here
@@ -114,3 +118,9 @@ OPimNotifyManager &OEvent::notifiers() {
 bool OEvent::hasNotifiers()const {
-    return  ( data->manager);
+    if (!data->manager )
+        return false;
+    if (data->manager->reminders().isEmpty() &&
+        data->manager->alarms().isEmpty() )
+        return false;
+
+    return true;
 }
@@ -199,2 +209,3 @@ void OEvent::setTimeZone( const QString& tz ) {
 QString OEvent::timeZone()const {
+    if (data->isAllDay ) return QString::fromLatin1("UTC");
     return data->timezone;
@@ -241,2 +252,7 @@ void OEvent::changeOrModify() {
         d2->timezone = data->timezone;
+        d2->parent = data->parent;
+        d2->child = data->child;
+
+        if (d2->child )
+            d2->child->detach();
 
@@ -258,4 +274,46 @@ QMap<QString, QString> OEvent::toExtraMap()const {
 }
+int OEvent::parent()const {
+    return data->parent;
+}
+void OEvent::setParent( int uid ) {
+    changeOrModify();
+    data->parent = uid;
+}
+QArray<int> OEvent::children() const{
+    if (!data->child) return QArray<int>();
+    else
+        return data->child->copy();
+}
+void OEvent::setChildren( const QArray<int>& arr ) {
+    changeOrModify();
+    if (data->child) delete data->child;
 
-
+    data->child = new QArray<int>( arr );
+    data->child->detach();
+}
+void OEvent::addChild( int uid ) {
+    changeOrModify();
+    if (!data->child ) {
+        data->child = new QArray<int>(1);
+        (*data->child)[0] = uid;
+    }else{
+        int count = data->child->count();
+        data->child->resize( count + 1 );
+        (*data->child)[count] = uid;
+    }
+}
+void OEvent::removeChild( int uid ) {
+    if (!data->child || !data->child->contains( uid ) ) return;
+    changeOrModify();
+    QArray<int> newAr( data->child->count() - 1 );
+    int j = 0;
+    uint count = data->child->count();
+    for ( uint i = 0; i < count; i++ ) {
+        if ( (*data->child)[i] != uid ) {
+            newAr[j] = (*data->child)[i];
+            j++;
+        }
+    }
+    (*data->child) = newAr;
+}
 struct OEffectiveEvent::Data : public QShared {
diff --git a/libopie2/opiepim/oevent.h b/libopie2/opiepim/oevent.h
index c718e2e..585515c 100644
--- a/libopie2/opiepim/oevent.h
+++ b/libopie2/opiepim/oevent.h
@@ -63,3 +63,3 @@ public:
     bool hasNotifiers()const;
-    OPimNotifyManager &notifiers();
+    OPimNotifyManager &notifiers()const;
 
@@ -101,3 +101,11 @@ public:
 
+    /** For exception to recurrence here is a list of children...  */
+    QArray<int> children()const;
+    void setChildren( const QArray<int>& );
+    void addChild( int uid );
+    void removeChild( int uid );
 
+    /** return the parent OEvent */
+    int parent()const;
+    void setParent( int uid );