rec fix

2 files changed, 14 insertions, 35 deletions

diff --git a/korganizer/komonthview.cpp b/korganizer/komonthview.cpp
index cb69832..004ff50 100644
--- a/korganizer/komonthview.cpp
+++ b/korganizer/komonthview.cpp
@@ -1255,22 +1255,19 @@ void KOMonthView::updateView()
     QPtrList<Event> events = calendar()->events();
     Event *event;
     QDateTime dt;
     bool ok;
     QDate endDate =  mStartDate.addDays( timeSpan );
     for( event = events.first(); event; event = events.next() ) { // for event
         if ( event->doesRecur() ) {
             bool last;
-            qDebug("********************************************** ");
-            qDebug("Event summary: %s ", event->summary().latin1());
             QDateTime incidenceStart = event->recurrence()->getPreviousDateTime( QDateTime( mStartDate ) , &last );
             QDateTime incidenceEnd;
             int eventlen = event->dtStart().date().daysTo ( event->dtEnd().date()  );
-            qDebug("eventlen %d ",  eventlen);
             bool invalid = false;
             while( true ) {
                     if ( incidenceStart.isValid() ) {
                         incidenceEnd = incidenceStart.addDays( eventlen );
                         int st =   incidenceStart.date().daysTo( endDate );
                         if ( st >= 0 ) { // start before timeend
                             int end = mStartDate.daysTo( incidenceEnd.date() );
                             if ( end >= 0 ) { // end after timestart --- got one!
@@ -1283,33 +1280,27 @@ void KOMonthView::updateView()
                                 for ( iii = st;iii<= end;++iii) 
                                     (*cells)[iii]->insertEvent( event );
                             }
                         }
                     } else {
                         if ( invalid )
                             break;
                         invalid = true;
-                        qDebug("invalid %s", event->summary().latin1());
+                        //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
                     if ( last )
                         break;
                     bool ok;
-                    qDebug("TRY next occurence %s ", incidenceStart.toString().latin1());
                     incidenceStart = event->getNextOccurence( incidenceStart.addSecs( 1 ) ,&ok );
-                    if ( ! ok ) {
-                        qDebug("NOT OK ");
+                    if ( ! ok )
                         break;
-                    }
-                    if ( incidenceStart.date() > endDate ) {
-                        qDebug("incidenceStart.date() > endDate ");
+                    if ( incidenceStart.date() > endDate )
                         break;
-                    }
-                    qDebug("next occurence %s ", incidenceStart.toString().latin1());
             }
         } else { // no recur 
             int st =  event->dtStart().date().daysTo( endDate );
             if ( st >= 0 ) { // start before timeend
                 int end = mStartDate.daysTo( event->dtEnd().date() );
                 if ( end >= 0 ) { // end after timestart --- got one!
                     //normalize
                     st =  timeSpan - st;
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 8a175c9..6ee5499 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -971,17 +971,17 @@ bool Recurrence::recursSecondly(const QDate &qd, int secondFreq) const
 {
   if ((qd >= mRecurStart.date()) &&
       ((rDuration > 0) && (qd <= endDate()) ||
        ((rDuration == 0) && (qd <= rEndDateTime.date())) ||
        (rDuration == -1))) {
     // The date queried falls within the range of the event.
     if (secondFreq < 24*3600)
       return true;      // the event recurs at least once each day
-    int after = mRecurStart.secsTo(QDateTime(qd));
+    int after = mRecurStart.secsTo(QDateTime(qd)) - 1;
     if (after / secondFreq != (after + 24*3600) / secondFreq)
       return true;
   }
   return false;
 }
 
 bool Recurrence::recursMinutelyAt(const QDateTime &dt, int minuteFreq) const
 {
@@ -1183,44 +1183,43 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const
   QDate nextDate;
 
   switch (recurs) {
     case rDaily:
       nextDate = dStart.addDays((dStart.daysTo(preDate)/rFreq + 1) * rFreq);
       break;
 
     case rWeekly: {
-      QDate start = dStart.addDays(1 - dStart.dayOfWeek());   // start of week for dStart
+      QDate start = dStart.addDays(-((dStart.dayOfWeek() - rWeekStart + 7)%7));  // start of week for dStart
       int earliestDayOfWeek = earliestDate.dayOfWeek();
       int weeksAhead = start.daysTo(earliestDate) / 7;
       int notThisWeek = weeksAhead % rFreq;    // zero if this week is a recurring week
       weeksAhead -= notThisWeek;               // latest week which recurred
       int weekday = 0;
       // First check for any remaining day this week, if this week is a recurring week
       if (!notThisWeek)
         weekday = getFirstDayInWeek(earliestDayOfWeek);
       // Check for a day in the next scheduled week
-      if (!weekday  &&  earliestDayOfWeek > 1)
+      if (!weekday )
         weekday = getFirstDayInWeek(rWeekStart) + rFreq*7;
-      if (weekday)
-        nextDate = start.addDays(weeksAhead*7 + weekday - 1);
+      nextDate = start.addDays(weeksAhead*7 + weekday - 1);
       break;
     }
     case rMonthlyDay:
     case rMonthlyPos: {
       int startYear  = dStart.year();
       int startMonth = dStart.month();     // 1..12
       int earliestYear = earliestDate.year();
       int monthsAhead = (earliestYear - startYear)*12 + earliestDate.month() - startMonth;
       int notThisMonth = monthsAhead % rFreq;    // zero if this month is a recurring month
       monthsAhead -= notThisMonth;               // latest month which recurred
       // Check for the first later day in the current month
       if (!notThisMonth)
         nextDate = getFirstDateInMonth(earliestDate);
-      if (!nextDate.isValid()  &&  earliestDate.day() > 1) {
+      if (!nextDate.isValid() ) {
         // Check for a day in the next scheduled month
         int months = startMonth - 1 + monthsAhead + rFreq;
         nextDate = getFirstDateInMonth(QDate(startYear + months/12, months%12 + 1, 1));
       }
       break;
     }
     case rYearlyMonth:
     case rYearlyPos:
@@ -1267,33 +1266,31 @@ QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) cons
   QDate prevDate;
 
   switch (recurs) {
     case rDaily:
       prevDate = dStart.addDays((dStart.daysTo(latestDate) / rFreq) * rFreq);
       break;
 
     case rWeekly: {
-      QDate start = dStart.addDays(1 - dStart.dayOfWeek());   // start of week for dStart
-      int latestDayOfWeek = latestDate.dayOfWeek();
+        QDate start = dStart.addDays(-((dStart.dayOfWeek() - rWeekStart + 7)%7));  // start of week for dStart
+        int latestDayOfWeek = latestDate.dayOfWeek();
       int weeksAhead = start.daysTo(latestDate) / 7;
       int notThisWeek = weeksAhead % rFreq;    // zero if this week is a recurring week
       weeksAhead -= notThisWeek;               // latest week which recurred
       int weekday = 0;
       // First check for any previous day this week, if this week is a recurring week
       if (!notThisWeek)
         weekday = getLastDayInWeek(latestDayOfWeek);
       // Check for a day in the previous scheduled week
       if (!weekday) {
+        if (!notThisWeek)
+          weeksAhead -= rFreq;
         int weekEnd = (rWeekStart + 5)%7 + 1;
-        if (latestDayOfWeek < weekEnd) {
-          if (!notThisWeek)
-            weeksAhead -= rFreq;
-          weekday = getLastDayInWeek(weekEnd);
-        }
+        weekday = getLastDayInWeek(weekEnd);
       }
       if (weekday)
         prevDate = start.addDays(weeksAhead*7 + weekday - 1);
       break;
     }
     case rMonthlyDay:
     case rMonthlyPos: {
       int startYear  = dStart.year();
@@ -3395,19 +3392,10 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
       break;
     }
   }
   return QDate();
 }
 
 void Recurrence::dump() const
 {
-  kdDebug() << "Recurrence::dump():" << endl;
-
-  kdDebug() << "  type: " << recurs << endl;
-  
-  kdDebug() << "  rDays: " << endl;
-  int i;
-  for( i = 0; i < 7; ++i ) {
-    kdDebug() << "    " << i << ": "
-              << ( rDays.testBit( i ) ? "true" : "false" ) << endl;
-  }
+    ;
 }