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
@@ -74,12 +74,21 @@ OEvent::OEvent( int uid )
 }
 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;
     }
 }
@@ -400,12 +409,16 @@ QMap<int, QString> OEvent::toMap()const {
 	    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 )