1 files changed, 12 insertions, 2 deletions

diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index 000ff71..188d8e1 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -32,133 +32,136 @@
 #include <qpe/stringutil.h>
 #include <qpe/timeconversion.h>
 
 #include <errno.h>
 #include <stdlib.h>
 
 
 class DateBookDBPrivate
 {
 public:
     bool clean;  // indcate whether we need to write to disk...
 };
 
 
 // Helper functions
 
 static QString dateBookJournalFile()
 {
     QString str = getenv("HOME");
     return QString( str +"/.caljournal" );
 }
 
 static QString dateBookFilename()
 {
     return Global::applicationFileName("datebook","datebook.xml");
 }
 
 /* Calculating the next event of a recuring event is actually
    computationally inexpensive, esp. compared to checking each day
    individually.  There are bad worse cases for say the 29th of
    february or the 31st of some other months.  However
    these are still bounded */
 bool nextOccurance(const Event &e, const QDate &from, QDateTime &next)
 {
     // easy checks, first are we too far in the future or too far in the past?
     QDate tmpDate;
     int freq = e.repeatPattern().frequency;
     int diff, diff2, a;
     int iday, imonth, iyear;
     int dayOfWeek = 0;
     int firstOfWeek = 0;
     int weekOfMonth;
 
 
     if (e.repeatPattern().hasEndDate && e.repeatPattern().endDate() < from)
         return FALSE;
 
     if (e.start() >= from) {
         next = e.start();
         return TRUE;
     }
 
     switch ( e.repeatPattern().type ) {
         case Event::Weekly:
             /* weekly is just daily by 7 */
             /* first convert the repeatPattern.Days() mask to the next
                day of week valid after from */
             dayOfWeek = from.dayOfWeek();
             dayOfWeek--; /* we want 0-6, doco for above specs 1-7 */
 
             /* this is done in case freq > 1 and from in week not
                for this round */
             // firstOfWeek = 0; this is already done at decl.
             while(!((1 << firstOfWeek) & e.repeatPattern().days))
-                firstOfWeek++;
+                firstOfWeek++;
+
+
 
             /* there is at least one 'day', or there would be no event */
             while(!((1 << (dayOfWeek % 7)) & e.repeatPattern().days))
-                dayOfWeek++;
+                dayOfWeek++;
+
 
             dayOfWeek = dayOfWeek % 7; /* the actual day of week */
             dayOfWeek -= e.start().date().dayOfWeek() -1;
 
             firstOfWeek = firstOfWeek % 7; /* the actual first of week */
             firstOfWeek -= e.start().date().dayOfWeek() -1;
 
             // dayOfWeek may be negitive now
             // day of week is number of days to add to start day
 
             freq *= 7;
             // FALL-THROUGH !!!!!
         case Event::Daily:
             // the add is for the possible fall through from weekly */
             if(e.start().date().addDays(dayOfWeek) > from) {
                 /* first week exception */
                 next = QDateTime(e.start().date().addDays(dayOfWeek),
                                  e.start().time());
                 if ((next.date() > e.repeatPattern().endDate())
                     && e.repeatPattern().hasEndDate)
                     return FALSE;
                 return TRUE;
             }
             /* if from is middle of a non-week */
 
             diff = e.start().date().addDays(dayOfWeek).daysTo(from) % freq;
             diff2 = e.start().date().addDays(firstOfWeek).daysTo(from) % freq;
 
             if(diff != 0)
                 diff = freq - diff;
             if(diff2 != 0)
                 diff2 = freq - diff2;
             diff = QMIN(diff, diff2);
 
             next = QDateTime(from.addDays(diff), e.start().time());
             if ( (next.date() > e.repeatPattern().endDate())
                  && e.repeatPattern().hasEndDate )
                 return FALSE;
             return TRUE;
         case Event::MonthlyDay:
             iday = from.day();
             iyear = from.year();
             imonth = from.month();
             /* find equivelent day of month for this month */
             dayOfWeek = e.start().date().dayOfWeek();
             weekOfMonth = (e.start().date().day() - 1) / 7;
 
             /* work out when the next valid month is */
             a = from.year() - e.start().date().year();
             a *= 12;
             a = a + (imonth - e.start().date().month());
             /* a is e.start()monthsFrom(from); */
             if(a % freq) {
                 a = freq - (a % freq);
                 imonth = from.month() + a;
                 if (imonth > 12) {
                     imonth--;
                     iyear += imonth / 12;
                     imonth = imonth % 12;
                     imonth++;
                 }
             }
             /* imonth is now the first month after or on
                from that matches the frequency given */
@@ -830,128 +833,135 @@ void DateBookDB::loadFile( const QString &strFile )
                 if ( value == "Daily" )
                     rp.type = Event::Daily;
                 else if ( value == "Weekly" )
                     rp.type = Event::Weekly;
                 else if ( value == "MonthlyDay" )
                     rp.type = Event::MonthlyDay;
                 else if ( value == "MonthlyDate" )
                     rp.type = Event::MonthlyDate;
                 else if ( value == "Yearly" )
                     rp.type = Event::Yearly;
                 else
                     rp.type = Event::NoRepeat;
                 break;
             case FRWeekdays:
                     // QtopiaDesktop 1.6 sometimes creates 'rweekdays="0"'
                     // when it goes mad. This causes datebook to crash.. (se)
                     if ( value.toInt() != 0 )
                             rp.days = value.toInt();
                     else
                             rp.days = 1;
                 break;
             case FRPosition:
                 rp.position = value.toInt();
                 break;
             case FRFreq:
                 rp.frequency = value.toInt();
                 break;
             case FRHasEndDate:
                 rp.hasEndDate = value.toInt();
                 break;
                 case FREndDate: {
                 rp.endDateUTC = (time_t) value.toLong();
                 break;
                 }
                 case FRStart: {
                 e.setStart( (time_t) value.toLong() );
                 break;
                 }
                 case FREnd: {
                 e.setEnd( (time_t) value.toLong() );
                 break;
                 }
             case FNote:
                 e.setNotes( value );
                 break;
             case FCreated:
                 rp.createTime = value.toInt();
                 break;
             case FAction:
                 currentAction = value.toInt();
                 break;
             case FActionKey:
                 journalKey = value.toInt();
                 break;
             case FJournalOrigHadRepeat:
                 origHadRepeat = value.toInt();
                 break;
             default:
                 qDebug( "huh??? missing enum? -- attr.: %s", attr );
                 break;
             }
 #endif
         }
         // "post processing" (dates, times, alarm, recurrence)
+
+        // other half of 1169 fixlet without getting into regression
+        // if rp.days == 0 and rp.type == Event::Weekly
+        if ( rp.type == Event::Weekly && rp.days == 0 )
+            rp.days = Event::day( e.start().date().dayOfWeek() );
+
+
         // start date/time
         e.setRepeat( rp.type != Event::NoRepeat, rp );
 
         if ( alarmTime != -1 )
             e.setAlarm( TRUE, alarmTime, alarmSound );
 
         // now do our action based on the current action...
         switch ( currentAction ) {
         case ACTION_ADD:
             addJFEvent( e );
             break;
         case ACTION_REMOVE:
             removeJFEvent( e );
             break;
         case ACTION_REPLACE:
             // be a little bit careful,
             // in case of a messed up journal...
             if ( journalKey > -1 && origHadRepeat > -1 ) {
                 // get the original from proper list...
                 if ( origHadRepeat )
                     removeJFEvent( *(repeatEvents.at(journalKey)) );
                 else
                     removeJFEvent( *(eventList.at(journalKey)) );
                 addJFEvent( e );
             }
             break;
         default:
             break;
         }
     }
     f.close();
 }
 
 void DateBookDB::init()
 {
     d = new DateBookDBPrivate;
     d->clean = false;
     QString str = dateBookFilename();
     if ( str.isNull() ) {
         QMessageBox::warning( 0, QObject::tr("Out of Space"),
                               QObject::tr("Unable to create start up files\n"
                                           "Please free up some space\n"
                                           "before entering data") );
     }
     // continuing along, we call this datebook filename again,
     // because they may fix it before continuing, though it seems
     // pretty unlikely...
     loadFile( dateBookFilename() );
 
     if ( QFile::exists( dateBookJournalFile() ) ) {
         // merge the journal
         loadFile( dateBookJournalFile() );
         // save in our changes and remove the journal...
         save();
     }
     d->clean = true;
 }
 
 bool DateBookDB::save()
 {
     if ( d->clean == true )
         return true;
     QValueListIterator<Event> it;
     int total_written;