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
@@ -1261,10 +1261,7 @@ void KOMonthView::updateView()
         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 ) {
@@ -1289,5 +1286,5 @@ void KOMonthView::updateView()
                             break;
                         invalid = true;
-                        qDebug("invalid %s", event->summary().latin1());
+                        //qDebug("invalid %s", event->summary().latin1());
                         incidenceStart = QDateTime( mStartDate ).addSecs( -2 );;
                     }
@@ -1295,15 +1292,9 @@ void KOMonthView::updateView()
                         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 
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 8a175c9..6ee5499 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -977,5 +977,5 @@ bool Recurrence::recursSecondly(const QDate &qd, int secondFreq) const
     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;
@@ -1189,5 +1189,5 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const
 
     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;
@@ -1199,8 +1199,7 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const
         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;
     }
@@ -1216,5 +1215,5 @@ QDate Recurrence::getNextDateNoTime(const QDate &preDate, bool *last) const
       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;
@@ -1273,6 +1272,6 @@ QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) cons
 
     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
@@ -1284,10 +1283,8 @@ QDate Recurrence::getPreviousDateNoTime(const QDate &afterDate, bool *last) cons
       // 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)
@@ -3401,13 +3398,4 @@ QDate Recurrence::getLastDateInYear(const QDate &latestDate) const
 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;
-  }
+    ;
 }