1 files changed, 61 insertions, 113 deletions

diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.cpp b/libopie2/opiepim/backend/odatebookaccessbackend.cpp
index f3b7b5f..73c7059 100644
--- a/libopie2/opiepim/backend/odatebookaccessbackend.cpp
+++ b/libopie2/opiepim/backend/odatebookaccessbackend.cpp
@@ -36,7 +36,8 @@ using namespace Opie;
 
 namespace {
 /* a small helper to get all NonRepeating events for a range of time */
-    void events( OEffectiveEvent::ValueList& tmpList, const OPimEvent::ValueList& events,
+void events( OPimBackendOccurrence::List& tmpList,
+             const OPimEvent::ValueList& events,
                  const QDate& from, const QDate& to ) {
         QDateTime dtStart, dtEnd;
 
@@ -48,50 +49,13 @@ namespace {
              * If in range
              */
             if (dtStart.date() >= from && dtEnd.date() <= to ) {
-                OEffectiveEvent eff;
-                eff.setEvent( (*it) );
-                eff.setDate( dtStart.date() );
-                eff.setStartTime( dtStart.time() );
-
-                /* if not on the same day */
-                if ( dtStart.date() != dtEnd.date() )
-                    eff.setEndTime( QTime(23, 59, 0 ) );
-                else
-                    eff.setEndTime( dtEnd.time() );
-
+            OPimBackendOccurrence eff( dtStart, dtEnd, (*it).uid() );;
                 tmpList.append( eff );
             }
-
-            /* we must also check for end date information... */
-            if ( dtEnd.date() != dtStart.date() && dtEnd.date() >= from ) {
-                QDateTime dt = dtStart.addDays( 1 );
-                dt.setTime( QTime(0, 0, 0 ) );
-                QDateTime dtStop;
-                if ( dtEnd > to )
-                    dtStop = to;
-                else
-                    dtStop = dtEnd;
-
-                while ( dt <= dtStop ) {
-                    OEffectiveEvent eff;
-                    eff.setEvent( (*it) );
-                    eff.setDate( dt.date() );
-
-                    if ( dt >= from ) {
-                        eff.setStartTime( QTime(0, 0, 0 ) );
-                        if ( dt.date() == dtEnd.date() )
-                            eff.setEndTime( dtEnd.time() );
-                        else
-                            eff.setEndTime( QTime(23, 59, 0 ) );
-                        tmpList.append( eff );
-                    }
-                    dt = dt.addDays( 1 );
-                }
-            }
         }
     }
 
-    void repeat( OEffectiveEvent::ValueList& tmpList, const OPimEvent::ValueList& list,
+void repeat( OPimBackendOccurrence::List& tmpList, const OPimEvent::ValueList& list,
                  const QDate& from, const QDate& to ) {
         QDate repeat;
         for ( OPimEvent::ValueList::ConstIterator it = list.begin(); it != list.end(); ++it ) {
@@ -102,48 +66,16 @@ namespace {
                 rec.setEndDate( to );
                 rec.setHasEndDate( true );
             }
+
+        QDateTime start, end;
             while (rec.nextOcurrence(itDate, repeat ) ) {
                 if (repeat > to ) break;
-                OEffectiveEvent eff;
-                eff.setDate( repeat );
-                if ( (*it).isAllDay() ) {
-                    eff.setStartTime( QTime(0, 0, 0 ) );
-                    eff.setEndTime( QTime(23, 59, 59 ) );
-                }else {
-                    /* we only occur by days, not hours/minutes/seconds.  Hence
-                     * the actual end and start times will be the same for
-                     * every repeated event.  For multi day events this is
-                     * fixed up later if on wronge day span
-                     */
-                    eff.setStartTime( (*it).startDateTime().time() );
-                    eff.setEndTime( (*it).endDateTime().time() );
-                }
-                if ( dur != 0 ) {
-                    // multi-day repeating events
-                    QDate sub_it = QMAX( repeat, from );
-                    QDate startDate = repeat;
-                    QDate endDate = startDate.addDays( dur );
-
-                    while ( sub_it <= endDate && sub_it <= to ) {
-                        OEffectiveEvent tmpEff = eff;
-                        tmpEff.setEvent( (*it) );
-                        if ( sub_it != startDate )
-                            tmpEff.setStartTime( QTime(0, 0, 0 ) );
-                        if ( sub_it != endDate )
-                            tmpEff.setEndTime( QTime( 23, 59, 59 ) );
-
-                        tmpEff.setDate( sub_it );
-                        tmpEff.setEffectiveDates( startDate, endDate );
-                        tmpList.append( tmpEff );
-
-                        sub_it = sub_it.addDays( 1 );
-                    }
-                    itDate = endDate;
-                }else {
-                    eff.setEvent( (*it) );
+
+            OPimEvent event = *it;
+            start = QDateTime( repeat, event.startDateTime().time() );
+            end   = QDateTime( repeat.addDays(dur), event.endDateTime().time() );
+            OPimBackendOccurrence eff(start, end, event.uid() );
                     tmpList.append( eff );
-                    itDate = repeat.addDays( 1 );
-                }
             }
         }
     }
@@ -159,58 +91,74 @@ ODateBookAccessBackend::ODateBookAccessBackend()
 ODateBookAccessBackend::~ODateBookAccessBackend() {
 
 }
-OEffectiveEvent::ValueList ODateBookAccessBackend::effectiveEvents( const QDate& from,
-                                                                    const QDate& to ) {
-    OEffectiveEvent::ValueList tmpList;
-    OPimEvent::ValueList list = directNonRepeats();
+OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDate& from,
+                                                                 const QDate& to )const {
+    OPimBackendOccurrence::List tmpList;
 
-    events( tmpList, list, from, to );
+    events( tmpList, directNonRepeats(), from, to );
     repeat( tmpList, directRawRepeats(),from,to );
 
-    list = directRawRepeats();  // Useless, isn't it ? (eilers)
-
-    qHeapSort( tmpList );
     return tmpList;
 }
-OEffectiveEvent::ValueList ODateBookAccessBackend::effectiveEvents( const QDateTime& dt ) {
-    OEffectiveEvent::ValueList day = effectiveEvents( dt.date(), dt.date() );
-    OEffectiveEvent::ValueList::Iterator it;
+OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDateTime& dt )const {
+    OPimBackendOccurrence::List day = occurrences( dt.date(), dt.date() );
 
-    OEffectiveEvent::ValueList tmpList;
-    QDateTime dtTmp;
-    for ( it = day.begin(); it != day.end(); ++it ) {
-        dtTmp = QDateTime( (*it).date(), (*it).startTime() );
-        if ( QABS(dt.secsTo(dtTmp) ) < 60 )
-            tmpList.append( (*it) );
+    return filterOccurrences( day, dt );
     }
 
-    return tmpList;
-}
-
-OEffectiveEvent::ValueList ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDate& from,
-                                                                    const QDate& to ) {
-    OEffectiveEvent::ValueList tmpList;
+OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDate& from,
+                                                                                 const QDate& to )const {
+    OPimBackendOccurrence::List tmpList;
     OPimEvent::ValueList list = directNonRepeats();
 
     events( tmpList, list, from, to );
 
-    qHeapSort( tmpList );
     return tmpList;
 }
 
-OEffectiveEvent::ValueList ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDateTime& dt ) {
-    OEffectiveEvent::ValueList day = effectiveNonRepeatingEvents( dt.date(), dt.date() );
-    OEffectiveEvent::ValueList::Iterator it;
+OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDateTime& dt )const {
+    OPimBackendOccurrence::List day = effectiveNonRepeatingEvents( dt.date(), dt.date() );
+    return filterOccurrences( day,dt );
+}
 
-    OEffectiveEvent::ValueList tmpList;
-    QDateTime dtTmp;
-    for ( it = day.begin(); it != day.end(); ++it ) {
-        dtTmp = QDateTime( (*it).date(), (*it).startTime() );
-        if ( QABS(dt.secsTo(dtTmp) ) < 60 )
-            tmpList.append( (*it) );
+
+UIDArray ODateBookAccessBackend::queryByExample( const OPimEvent&, int settings,
+                                                 const QDateTime& d )const {
+    return UIDArray();
     }
 
-    return tmpList;
+UIDArray ODateBookAccessBackend::sorted( const UIDArray&, bool asc, int, int, const QArray<int>& )const {
+    return UIDArray();
+}
+
+OPimBackendOccurrence::List ODateBookAccessBackend::filterOccurrences( const OPimBackendOccurrence::List dayList,
+                                                                       const QDateTime& dt ) {
+    OPimBackendOccurrence::List tmpList;
+    OPimBackendOccurrence::List::ConstIterator it;
+
+    for ( it = dayList.begin(); it != dayList.end(); ++it ) {
+        OPimBackendOccurrence occ = *it;
+
+        /*
+         * Let us find occurrences that are 'now'!
+         * If the dt.date() is on the same day as start or end of the Occurrence
+         * check how near start/end are.
+         * If it is in the middle of a multiday occurrence list it.
+         *
+         * We might want to 'lose' the sixty second offset and list
+         * all Events which are active at that time.
+         */
+        if ( dt.date() == occ.startDateTime().date() ) {
+            if ( QABS( dt.time().secsTo( occ.startDateTime().time() ) ) < 60 )
+                tmpList.append( occ );
+        }else if ( dt.date() == occ.endDateTime().date() ) {
+            if ( QABS( dt.time().secsTo( occ.endDateTime().time()   ) ) < 60 )
+                tmpList.append( occ );
+        }else if ( dt.date() >= occ.startDateTime().date() &&
+                   dt.date() >= occ.endDateTime().date()  )
+            tmpList.append( occ );
 }
 
+    return tmpList;
+}
 }