Fixed some problems with the recurrence

3 files changed, 30 insertions, 13 deletions

diff --git a/libkcal/icalformatimpl.cpp b/libkcal/icalformatimpl.cpp
index 32a1337..964ffe3 100644
--- a/libkcal/icalformatimpl.cpp
+++ b/libkcal/icalformatimpl.cpp
@@ -1391,9 +1391,9 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
     }
     if ( r.freq == ICAL_YEARLY_RECURRENCE ) {
         if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX && r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
             frequ = ICAL_MONTHLY_RECURRENCE;
-            interv = 12;
+            interv = 12* r.interval;
         }
     }
   
     switch (frequ) {
@@ -1498,8 +1498,9 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
         }
         break;
     case ICAL_YEARLY_RECURRENCE:
         if (r.by_year_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+            qDebug(" YEARLY  DAY OF YEAR");
             if (!icaltime_is_null_time(r.until)) {
                 recur->setYearly(Recurrence::rYearlyDay,interv,
                                  readICalDate(r.until));
             } else {
@@ -1512,8 +1513,9 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
                 recur->addYearlyNum(day);
             }
         } else if ( true /*r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX*/) {
             if (r.by_day[0] != ICAL_RECURRENCE_ARRAY_MAX) {
+                qDebug("YEARLY POS NOT SUPPORTED BY GUI");
                 if (!icaltime_is_null_time(r.until)) {
                     recur->setYearly(Recurrence::rYearlyPos,interv,
                                      readICalDate(r.until));
                 } else {
@@ -1542,8 +1544,9 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
                         recur->addYearlyMonthPos(r.by_set_pos[0],qba);
                     }
                 }
             } else { 
+                qDebug("YEARLY MONTH ");
                 if (!icaltime_is_null_time(r.until)) {
                     recur->setYearly(Recurrence::rYearlyMonth,interv,
                                      readICalDate(r.until));
                 } else {
@@ -1551,17 +1554,18 @@ void ICalFormatImpl::readRecurrence( const struct icalrecurrencetype &r, Recurre
                         recur->setYearly(Recurrence::rYearlyMonth,interv,-1);
                     else
                         recur->setYearly(Recurrence::rYearlyMonth,interv,r.count);
                 }
-            }
-            if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
-                index = 0;
-                while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
-                    recur->addYearlyNum(day);
+                if ( r.by_month[0] != ICAL_RECURRENCE_ARRAY_MAX ) {
+                    index = 0;
+                    while((day = r.by_month[index++]) != ICAL_RECURRENCE_ARRAY_MAX) {
+                        recur->addYearlyNum(day);
+                    }
+                } else {
+                    recur->addYearlyNum(incidence->dtStart().date().month());
                 }
-            } else {
-                recur->addYearlyNum(incidence->dtStart().date().month());
             }
+
         }
       break;
   default:
       ;
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 5fc5d1f..dd74e10 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -653,9 +653,9 @@ void Recurrence::addMonthlyPos_(short _rPos, const QBitArray &_rDays)
 }
 
 void Recurrence::addMonthlyDay(short _rDay)
 {
-  if (mRecurReadOnly || recurs != rMonthlyDay
+  if (mRecurReadOnly || (recurs != rMonthlyDay && recurs != rYearlyMonth)
   ||  _rDay == 0 || _rDay > 31 || _rDay < -31)   // invalid day number
     return;
   for (int* it = rMonthDays.first();  it;  it = rMonthDays.next()) {
     if (_rDay == *it)
@@ -724,9 +724,22 @@ void Recurrence::addYearlyMonthPos(short _rPos, const QBitArray &_rDays)
 const QPtrList<int> &Recurrence::yearNums() const
 {
   return rYearNums;
 }
-
+void Recurrence::addYearlyMonth(short _rPos )
+{ 
+    if (mRecurReadOnly  ||  recurs != rYearlyMonth)    // invalid day/month number
+    return;
+  rMonthPos *tmpPos = new rMonthPos;
+  if ( _rPos > 0) {
+    tmpPos->rPos = _rPos;
+    tmpPos->negative = false;
+  } else {
+    tmpPos->rPos = -_rPos; // take abs()
+    tmpPos->negative = true;
+  }
+  rMonthPositions.append(tmpPos);
+}
 void Recurrence::addYearlyNum(short _rNum)
 {
   if (mRecurReadOnly
   ||  (recurs != rYearlyMonth && recurs != rYearlyDay && recurs != rYearlyPos)
diff --git a/libkcal/recurrence.h b/libkcal/recurrence.h
index a0f6d84..b13d14f 100644
--- a/libkcal/recurrence.h
+++ b/libkcal/recurrence.h
@@ -287,14 +287,16 @@ class Recurrence
     /** Sets the default method for handling yearly recurrences of February 29th. */
     static void setFeb29YearlyTypeDefault(Feb29Type t)  { mFeb29YearlyDefaultType = t; }
     /** Returns the default method for handling yearly recurrences of February 29th. */
     static Feb29Type setFeb29YearlyTypeDefault()  { return mFeb29YearlyDefaultType; }
-
+    void addYearlyMonth(short _rPos ); // added LR
     /**
       Debug output.
     */
     void dump() const;
     QString recurrenceText() const;
+    bool getYearlyMonthMonths(int day, QValueList<int>&,
+                              QValueList<int> &leaplist) const;
 
   protected:
     enum PeriodFunc { END_DATE_AND_COUNT, COUNT_TO_DATE, NEXT_AFTER_DATE };
     struct MonthlyData;     friend struct MonthlyData;
@@ -345,10 +347,8 @@ class Recurrence
     int  countMonthlyPosDays() const;
     void getMonthlyPosDays(QValueList<int>&, int daysInMonth,
                            int startDayOfWeek) const;
     bool getMonthlyDayDays(QValueList<int>&, int daysInMonth) const;
-    bool getYearlyMonthMonths(int day, QValueList<int>&,
-                              QValueList<int> &leaplist) const;
 
     int   getFirstDayInWeek(int startDay, bool useWeekStart = true) const;
     int   getLastDayInWeek(int endDay, bool useWeekStart = true) const;
     QDate getFirstDateInMonth(const QDate& earliestDate) const;