Added getEvent(uid) and a fix reassigning uids to events whos uids have been cleared

2 files changed, 27 insertions, 1 deletions

diff --git a/library/datebookdb.cpp b/library/datebookdb.cpp
index bf7fd94..da5a797 100644
--- a/library/datebookdb.cpp
+++ b/library/datebookdb.cpp
@@ -432,106 +432,111 @@ QValueList<Event> DateBookDB::getEvents( const QDate &from, const QDate &to )
     qHeapSort(tmpList);
     return tmpList;
 }
 
 QValueList<Event> DateBookDB::getEvents( const QDateTime &start )
 {
     QValueList<Event> day = getEvents(start.date(),start.date());
 
     QValueListConstIterator<Event> it;
     QDateTime dtTmp;
     QValueList<Event> tmpList;
     for (it = day.begin(); it != day.end(); ++it ) {
         dtTmp = (*it).start(TRUE);
         if ( dtTmp == start )
             tmpList.append( *it );
     }
     return tmpList;
 }
 
 //#### Why is this code duplicated in getEvents ?????
 
 QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDate &from,
 							   const QDate &to )
 {
     QValueList<EffectiveEvent> tmpList;
     QValueListIterator<Event> it;
 
     EffectiveEvent effEv;
     QDateTime dtTmp,
 	      dtEnd;
 
     for (it = eventList.begin(); it != eventList.end(); ++it ) {
+	if (!(*it).isValidUid()) 
+	    (*it).assignUid(); // FIXME: Hack to restore cleared uids
+
         dtTmp = (*it).start(TRUE);
 	dtEnd = (*it).end(TRUE);
 
         if ( dtTmp.date() >= from && dtTmp.date() <= to ) {
 	    Event tmpEv = *it;
 	    effEv.setEvent(tmpEv);
 	    effEv.setDate( dtTmp.date() );
 	    effEv.setStart( dtTmp.time() );
 	    if ( dtTmp.date() != dtEnd.date() )
 		effEv.setEnd( QTime(23, 59, 0) );
 	    else
 		effEv.setEnd( dtEnd.time() );
             tmpList.append( effEv );
 	}
 	// we must also check for end date information...
 	if ( dtEnd.date() != dtTmp.date() && dtEnd.date() >= from ) {
 	    QDateTime dt = dtTmp.addDays( 1 );
 	    dt.setTime( QTime(0, 0, 0) );
 	    QDateTime dtStop;
 	    if ( dtEnd > to ) {
 		dtStop = to;
 	    } else
 		dtStop = dtEnd;
 	    while ( dt <= dtStop ) {
 		Event tmpEv = *it;
 		effEv.setEvent( tmpEv );
 		effEv.setDate( dt.date() );
 		if ( dt >= from ) {
 		    effEv.setStart( QTime(0, 0, 0) );
 		    if ( dt.date() == dtEnd.date() )
 			effEv.setEnd( dtEnd.time() );
 		    else
 			effEv.setEnd( QTime(23, 59, 59) );
 		    tmpList.append( effEv );
 		}
 		dt = dt.addDays( 1 );
 	    }
 	}
     }
     // check for repeating events...
     QDateTime repeat;
     for ( it = repeatEvents.begin(); it != repeatEvents.end(); ++it ) {
+	if (!(*it).isValidUid()) 
+	    (*it).assignUid(); // FIXME: Hack to restore cleared uids
 
 	/* create a false end date, to short circuit on hard
 	   MonthlyDay recurences */
 	Event dummy_event = *it;
 	int duration = (*it).start().date().daysTo( (*it).end().date() );
 	QDate itDate = from.addDays(-duration);
 
 	Event::RepeatPattern r = dummy_event.repeatPattern();
 	if ( !r.hasEndDate || r.endDate() > to ) {
 	    r.setEndDate( to );
 	    r.hasEndDate = TRUE;
 	}
 	dummy_event.setRepeat(TRUE, r);
 
 	while (nextOccurance(dummy_event, itDate, repeat)) {
 	    if(repeat.date() > to)
 		break;
 	    effEv.setDate( repeat.date() );
 	    if ((*it).type() == Event::AllDay) {
 		effEv.setStart( QTime(0,0,0) );
 		effEv.setEnd( 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 */
 		effEv.setStart( (*it).start().time() );
 		effEv.setEnd( (*it).end().time() );
 	    }
 	    if ( duration != 0 ) {
 		// multi-day repeating events
 		QDate sub_it = QMAX( repeat.date(), from );
@@ -553,118 +558,136 @@ QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDate &from,
 		    sub_it = sub_it.addDays( 1 );
 		}
 		itDate = endDate;
 	    } else {
 		Event tmpEv = *it;
 		effEv.setEvent( tmpEv );
 		tmpList.append( effEv );
 		itDate = repeat.date().addDays( 1 );
 	    }
 	}
     }
 
     qHeapSort( tmpList );
     return tmpList;
 }
 
 QValueList<EffectiveEvent> DateBookDB::getEffectiveEvents( const QDateTime &dt)
 {
     QValueList<EffectiveEvent> day = getEffectiveEvents(dt.date(), dt.date());
     QValueListConstIterator<EffectiveEvent> it;
     QValueList<EffectiveEvent> tmpList;
     QDateTime dtTmp;
 
     for (it = day.begin(); it != day.end(); ++it ) {
         dtTmp = QDateTime( (*it).date(), (*it).start() );
 	// at the moment we don't have second granularity, be nice about that..
         if ( QABS(dt.secsTo(dtTmp)) < 60 )
             tmpList.append( *it );
     }
     return tmpList;
 }
 
+Event DateBookDB::getEvent( int uid ) {
+    QValueList<Event>::ConstIterator it;
+    
+    for (it = eventList.begin(); it != eventList.end(); it++) {
+	if ((*it).uid() == uid) return *it;
+    }
+    for (it = repeatEvents.begin(); it != repeatEvents.end(); it++) {
+	if ((*it).uid() == uid) return *it;
+    }
+
+    qDebug("Event not found: uid=%d\n", uid);
+}
+
 
 void DateBookDB::addEvent( const Event &ev, bool doalarm )
 {
     // write to the journal...
     saveJournalEntry( ev, ACTION_ADD, -1, false );
     addJFEvent( ev, doalarm );
     d->clean = false;
 }
 
 void DateBookDB::addJFEvent( const Event &ev, bool doalarm )
 {
     if ( doalarm && ev.hasAlarm() )
 	addEventAlarm( ev );
     if ( ev.hasRepeat() )
 	repeatEvents.append( ev );
     else
 	eventList.append( ev );
 }
 
 void DateBookDB::editEvent( const Event &old, Event &editedEv )
 {
     int oldIndex=0;
     bool oldHadRepeat = old.hasRepeat();
     Event orig;
 
     // write to the journal...
     if ( oldHadRepeat ) {
 	if ( origRepeat( old, orig ) ) // should work always...
 	    oldIndex = repeatEvents.findIndex( orig );
     } else
 	oldIndex = eventList.findIndex( old );
     saveJournalEntry( editedEv, ACTION_REPLACE, oldIndex, oldHadRepeat );
 
+    // Delete old event
     if ( old.hasAlarm() )
 	delEventAlarm( old );
     if ( oldHadRepeat ) {
-	if ( oldHadRepeat && editedEv.hasRepeat() ) {
+	if ( editedEv.hasRepeat() ) { // This mean that origRepeat was run above and 
+ 	                              // orig is initialized
 	    // assumption, when someone edits a repeating event, they
 	    // want to change them all, maybe not perfect, but it works
 	    // for the moment...
 	    repeatEvents.remove( orig );
 	} else
 	    removeRepeat( old );
     } else {
 	QValueList<Event>::Iterator it = eventList.find( old );
 	if ( it != eventList.end() )
 	    eventList.remove( it );
     }
+
+    // Add new event
     if ( editedEv.hasAlarm() )
 	addEventAlarm( editedEv );
     if ( editedEv.hasRepeat() )
 	repeatEvents.append( editedEv );
     else
 	eventList.append( editedEv );
+
     d->clean = false;
 }
 
 void DateBookDB::removeEvent( const Event &ev )
 {
     // write to the journal...
     saveJournalEntry( ev, ACTION_REMOVE, -1, false );
     removeJFEvent( ev );
     d->clean = false;
 }
 
 void DateBookDB::removeJFEvent( const Event&ev )
 {
     if ( ev.hasAlarm() )
 	delEventAlarm( ev );
     if ( ev.hasRepeat() ) {
 	removeRepeat( ev );
     } else {
 	QValueList<Event>::Iterator it = eventList.find( ev );
 	if ( it != eventList.end() )
 	    eventList.remove( it );
     }
 }
 
 // also handles journaling...
 void DateBookDB::loadFile( const QString &strFile )
 {
     
     QFile f( strFile );
     if ( !f.open( IO_ReadOnly ) )
 	return;
 
diff --git a/library/datebookdb.h b/library/datebookdb.h
index aadb397..e4c251c 100644
--- a/library/datebookdb.h
+++ b/library/datebookdb.h
@@ -15,71 +15,74 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef DATEBOOKDB_H
 #define DATEBOOKDB_H
 
 #include <qdatetime.h>
 #include <qfile.h>
 #include <qvaluelist.h>
 #include <qpe/event.h>
 
 // journal actions...
 enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE };
 
 class DateBookDBPrivate;
 class DateBookDB
 {
 public:
     DateBookDB();
     ~DateBookDB();
 
     // very depreciated now!!!
     QValueList<Event> getEvents( const QDate &from, const QDate &to );
     QValueList<Event> getEvents( const QDateTime &start );
 
     // USE THESE!!!
     QValueList<EffectiveEvent> getEffectiveEvents( const QDate &from,
 						   const QDate &to );
     QValueList<EffectiveEvent> getEffectiveEvents( const QDateTime &start );
+    Event getEvent( int uid );
 
     QValueList<Event> getRawRepeats() const;
     QValueList<Event> getNonRepeatingEvents( const QDate &from,
 					     const QDate &to ) const;
 
     // Use these when dealing with adding removing events...
     void addEvent( const Event &ev, bool doalarm=TRUE );
     void removeEvent( const Event &ev );
     void editEvent( const Event &old, Event &ev );
     // add/remove event without journaling ( these ended up in public by accident, never
     // use them unless you know what you are doing...),
     // please put them in private if we ever can change the class...
     void addJFEvent( const Event &ev, bool doalarm=TRUE );
     void removeJFEvent( const Event &ev );
 
     bool save();
     void reload();
 private:
     //find the real repeat...
     bool origRepeat( const Event &ev, Event &orig ) const;
     bool removeRepeat( const Event &ev );
     void init();
     void loadFile( const QString &strFile );
     // depreciated...
     void saveJournalEntry( const Event &ev, journal_action action );
     // new version, uncomment the "= -1" when we remove the above
     // function..
     bool saveJournalEntry( const Event &ev, journal_action action,
 			   int key/* = -1*/, bool origHadRepeat = false );
 
     QValueList<Event> eventList; // non-repeating events...
     QValueList<Event> repeatEvents; // the repeating events...
     DateBookDBPrivate *d;
     QFile journalFile;
+
+    int	recordIdMax;  // ADDITION
 };
 
 /* helper functions, also useful to other apps. */
 bool nextOccurance( const Event &e, const QDate &from, QDateTime &next);
 #endif