Platform MacOS-X: Disable backtrce in odebug..

Libopie PIM: Finishing SQL-Backend for Todo. Recurrance events are supported now.
What is still missing: Custom entries currently not stored. It isn't easy to
implement them with enabled prefetch-cache.
LibopieDB2: Adding -lsqlite here instead linking it to libopie

5 files changed, 140 insertions, 30 deletions

diff --git a/libopie2/opiecore/oglobalsettings.h b/libopie2/opiecore/oglobalsettings.h
index d3f357e..e3ac148 100644
--- a/libopie2/opiecore/oglobalsettings.h
+++ b/libopie2/opiecore/oglobalsettings.h
@@ -204,7 +204,7 @@ class OGlobalSettings
         */
         DebugNone=-1,
        /**
-        * Debug output is sent to files /var/log/***.
+        * Debug output is sent to files /var/log/.
         */
         DebugFiles=0,
        /**
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index bf547ab..6a4e8f1 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -29,11 +29,13 @@ DEPENDPATH  += $(OPIEDIR)/include
 MOC_DIR     = moc
 OBJECTS_DIR = obj
 
+LIBS += -lsqlite -lqpe
+
 !contains( platform, x11 ) {
   include ( $(OPIEDIR)/include.pro )
 }
 
 contains( platform, x11 ) {
-  LIBS        = -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
+  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib 
 }
 
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index ebd03bb..3913661 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -123,7 +123,9 @@ namespace {
         QString qu;
         qu += "create table todolist( uid PRIMARY KEY, categories, completed, ";
         qu += "description, summary, priority, DueDate, progress ,  state, ";
-	qu += "Recurrence, reminders, alarms, maintainer, startdate, completeddate);";
+	// This is the recurrance-stuff .. Exceptions are currently not supported (see ORecur.cpp) ! (eilers)
+	qu += "RType, RWeekdays, RPosition, RFreq, RHasEndDate, EndDate, Created, Exceptions, "; 
+	qu += "reminders, alarms, maintainer, startdate, completeddate);";
 	qu += "create table custom_data( uid INTEGER, id INTEGER, type VARCHAR(10), value VARCHAR(10), PRIMARY KEY /* identifier */ (uid, id) );";
         return qu;
     }
@@ -174,6 +176,7 @@ namespace {
 		eDay  = eDate.day();
 	} 
         QString qu;
+	QMap<int, QString> recMap = m_todo.recurrence().toMap();
         qu  = "insert into todolist VALUES(" 
 		+  QString::number( m_todo.uid() ) + "," 
 		+ "'" + m_todo.idsToString( m_todo.categories() ) + "'" + ","
@@ -186,7 +189,14 @@ namespace {
 		+       "-" + QString::number( day )              + "'" + ","
 		+       QString::number( m_todo.progress() )            + ","
  		+       QString::number( m_todo.state().state() )       + ","
-		+ "'" + m_todo.recurrence().toString()            + "'"+ ",";
+		+ "'" + recMap[ ORecur::RType ]                   + "'" + ","
+		+ "'" + recMap[ ORecur::RWeekdays ]               + "'" + ","
+		+ "'" + recMap[ ORecur::RPosition ]               + "'" + ","
+		+ "'" + recMap[ ORecur::RFreq ]                   + "'" + ","
+		+ "'" + recMap[ ORecur::RHasEndDate ]             + "'" + ","
+		+ "'" + recMap[ ORecur::EndDate ]                 + "'" + ","
+		+ "'" + recMap[ ORecur::Created ]                 + "'" + ","
+		+ "'" + recMap[ ORecur::Exceptions ]              + "'" + ",";
 	
 	if ( m_todo.hasNotifiers() ) {
 		OPimNotifyManager manager = m_todo.notifiers();
@@ -524,6 +534,8 @@ OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     hasDueDate = date( dueDate, item.data("DueDate") );
     QStringList cats = QStringList::split(";", item.data("categories") );
 
+    qWarning("Item is completed: %d", item.data("completed").toInt() );
+
     OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(),
               cats, item.data("summary"), item.data("description"),
               item.data("progress").toUShort(), hasDueDate, dueDate,
@@ -552,8 +564,19 @@ OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const {
     pimState.setState( QString( item.data("state") ).toInt() );
     to.setState( pimState );
 
-    // Recurrence not supported yet
-    // to.setRecurrence( 
+    QMap<int, QString> recMap;
+    recMap.insert( ORecur::RType      , item.data("RType") );
+    recMap.insert( ORecur::RWeekdays  , item.data("RWeekdays") );
+    recMap.insert( ORecur::RPosition  , item.data("RPosition") );
+    recMap.insert( ORecur::RFreq      , item.data("RFreq") );
+    recMap.insert( ORecur::RHasEndDate, item.data("RHasEndDate") );
+    recMap.insert( ORecur::EndDate    , item.data("EndDate") );
+    recMap.insert( ORecur::Created    , item.data("Created") );
+    recMap.insert( ORecur::Exceptions , item.data("Exceptions") );
+    
+    ORecur recur;
+    recur.fromMap( recMap );
+    to.setRecurrence( recur );
 
     return to;
 }
diff --git a/libopie2/opiepim/core/orecur.cpp b/libopie2/opiepim/core/orecur.cpp
index eae1fdc..8c9ad46 100644
--- a/libopie2/opiepim/core/orecur.cpp
+++ b/libopie2/opiepim/core/orecur.cpp
@@ -456,55 +456,130 @@ void ORecur::checkOrModify() {
 }
 QString ORecur::toString()const {
     QString buf;
+    QMap<int, QString> recMap = toMap();
 
     buf += " rtype=\"";
+    buf += recMap[ORecur::RType];
+    buf += "\"";
+    if (data->days > 0 )
+	buf += " rweekdays=\"" + recMap[ORecur::RWeekdays] + "\"";
+    if ( data->pos != 0 )
+	buf += " rposition=\"" + recMap[ORecur::RPosition] + "\"";
+
+    buf += " rfreq=\"" + recMap[ORecur::RFreq] + "\"";
+    buf += " rhasenddate=\"" + recMap[ORecur::RHasEndDate]+ "\"";
+    if ( data->hasEnd )
+	buf += " enddt=\""
+	       + recMap[ORecur::EndDate]
+	       + "\"";
+    buf += " created=\"" + recMap[ORecur::Created] + "\"";
+
+    if ( data->list.isEmpty() ) return buf;
+    buf += " exceptions=\"";
+    buf += recMap[ORecur::Exceptions];
+    buf += "\" ";
+
+    return buf;
+}
+
+QString ORecur::rTypeString() const
+{
+	QString retString;
     switch ( data->type ) {
     case ORecur::Daily:
-        buf += "Daily";
+		retString = "Daily";
         break;
     case ORecur::Weekly:
-        buf += "Weekly";
+		retString = "Weekly";
         break;
     case ORecur::MonthlyDay:
-        buf += "MonthlyDay";
+		retString = "MonthlyDay";
         break;
     case ORecur::MonthlyDate:
-        buf += "MonthlyDate";
+		retString = "MonthlyDate";
         break;
     case ORecur::Yearly:
-        buf += "Yearly";
+		retString = "Yearly";
         break;
     default:
-        buf += "NoRepeat";
+		retString = "NoRepeat";
         break;
+
     }
-    buf += "\"";
-    if (data->days > 0 )
-	buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\"";
-    if ( data->pos != 0 )
-	buf += " rposition=\"" + QString::number(data->pos ) + "\"";
 
-    buf += " rfreq=\"" + QString::number( data->freq ) + "\"";
-    buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\"";
+	return retString;
+}
+
+QMap<QString, ORecur::RepeatType> ORecur::rTypeValueConvertMap() const
+{
+	QMap<QString, RepeatType> convertMap;
+
+	convertMap.insert( QString( "Daily" ), ORecur::Daily );
+	convertMap.insert( QString( "Weekly" ), ORecur::Weekly );
+	convertMap.insert( QString( "MonthlyDay" ), ORecur::MonthlyDay );
+	convertMap.insert( QString( "MonthlyDate" ), ORecur::MonthlyDate );
+	convertMap.insert( QString( "Yearly" ), ORecur::Yearly );
+	convertMap.insert( QString( "NoRepeat" ), ORecur::NoRepeat );
+
+	return convertMap;
+}
+
+
+QMap<int, QString> ORecur::toMap() const
+{
+	QMap<int, QString> retMap;
+	
+	retMap.insert( ORecur::RType, rTypeString() );
+	retMap.insert( ORecur::RWeekdays, QString::number( static_cast<int>( data->days ) ) );
+	retMap.insert( ORecur::RPosition, QString::number(data->pos ) );
+	retMap.insert( ORecur::RFreq, QString::number( data->freq ) );
+	retMap.insert( ORecur::RHasEndDate, QString::number( static_cast<int>( data->hasEnd ) ) );
     if ( data->hasEnd )
-	buf += " enddt=\""
-	       + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) )
-	       + "\"";
-    buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\"";
+		retMap.insert( ORecur::EndDate, QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) );
+	retMap.insert( ORecur::Created, QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) );
+	
+	if ( data->list.isEmpty() ) return retMap;
 
-    if ( data->list.isEmpty() ) return buf;
     // save exceptions list here!!
     ExceptionList::ConstIterator it;
     ExceptionList list = data->list;
-    buf += " exceptions=\"";
+	QString exceptBuf;
     QDate date;
     for ( it = list.begin(); it != list.end(); ++it ) {
         date = (*it);
-        if ( it != list.begin() ) buf += " ";
+		if ( it != list.begin() ) exceptBuf += " ";
 
-        buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
+		exceptBuf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() );
     }
-    buf += "\" ";
 
-    return buf;
+	retMap.insert( ORecur::Exceptions, exceptBuf );
+
+	return retMap;
+}
+
+void ORecur::fromMap( const QMap<int, QString>& map )
+{
+	QMap<QString, RepeatType> repTypeMap = rTypeValueConvertMap(); 
+
+	data -> type  = repTypeMap[ map [ORecur::RType] ];
+	data -> days  = (char) map[ ORecur::RWeekdays ].toInt();
+	data -> pos   = map[ ORecur::RPosition ].toInt();
+	data -> freq = map[ ORecur::RFreq ].toInt();
+	data -> hasEnd= map[ ORecur::RHasEndDate ].toInt() ? true : false;
+	OTimeZone utc = OTimeZone::utc();
+	if ( data -> hasEnd ){
+		data -> end = utc.fromUTCDateTime( (time_t) map[ ORecur::EndDate ].toLong() ).date();
+	}
+	data -> create = utc.fromUTCDateTime( (time_t) map[ ORecur::Created ].toLong() ).date();
+
+#if 0
+	// FIXME: Exceptions currently not supported...
+	// Convert the list of exceptions from QString into ExceptionList
+	data -> list.clear();
+	QString exceptStr = map[ ORecur::Exceptions ];
+	QStringList exceptList = QStringList::split( " ", exceptStr );
+	...
+#endif
+	
+	
 }
diff --git a/libopie2/opiepim/core/orecur.h b/libopie2/opiepim/core/orecur.h
index b214b3f..47901b0 100644
--- a/libopie2/opiepim/core/orecur.h
+++ b/libopie2/opiepim/core/orecur.h
@@ -9,7 +9,7 @@
 
 #include <qdatetime.h>
 #include <qvaluelist.h>
-
+#include <qmap.h>
 
 class ORecur {
 public:
@@ -18,6 +18,9 @@ public:
                      MonthlyDate, Yearly };
     enum Days { MON = 0x01, TUE = 0x02, WED = 0x04, THU = 0x08,
                 FRI = 0x10, SAT = 0x20, SUN = 0x40 };
+    enum Fields{ RType = 0, RWeekdays, RPosition, RFreq, RHasEndDate, 
+		 EndDate, Created, Exceptions };
+
     ORecur();
     ORecur( const ORecur& );
     ~ORecur();
@@ -74,6 +77,9 @@ public:
 
     void setService( const QString& ser );
 
+    QMap<int, QString> toMap() const;
+    void fromMap( const QMap<int, QString>& map );
+
     /* almost internal */
     QString toString()const;
 private:
@@ -81,6 +87,10 @@ private:
     void deref();
     inline void checkOrModify();
 
+    /* Converts rType to String */
+    QString rTypeString() const;
+    /* Returns a map to convert Stringname for RType to RepeatType */
+    QMap<QString, RepeatType> rTypeValueConvertMap() const;
 
     class Data;
     Data* data;