1 files changed, 19 insertions, 5 deletions

diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp
index 3b4cab2..7a55c67 100644
--- a/libopie/pim/otodoaccessxml.cpp
+++ b/libopie/pim/otodoaccessxml.cpp
@@ -26,193 +26,193 @@ bool OTodoAccessXML::load() {
     m_changed = false;
     /* initialize dict */
     /*
      * UPDATE dict if you change anything!!!
      */
     QAsciiDict<int> dict(15);
     dict.setAutoDelete( TRUE );
     dict.insert("Categories" ,     new int(OTodo::Category)         );
     dict.insert("Uid" ,            new int(OTodo::Uid)              );
     dict.insert("HasDate" ,        new int(OTodo::HasDate)          );
     dict.insert("Completed" ,      new int(OTodo::Completed)        );
     dict.insert("Description" ,    new int(OTodo::Description)      );
     dict.insert("Summary" ,        new int(OTodo::Summary)          );
     dict.insert("Priority" ,       new int(OTodo::Priority)         );
     dict.insert("DateDay" ,        new int(OTodo::DateDay)          );
     dict.insert("DateMonth" ,      new int(OTodo::DateMonth)        );
     dict.insert("DateYear" ,       new int(OTodo::DateYear)         );
     dict.insert("Progress" ,       new int(OTodo::Progress)         );
     dict.insert("Completed",       new int(OTodo::Completed)        );
     dict.insert("CrossReference",  new int(OTodo::CrossReference)   );
     dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) );
     dict.insert("AlarmDateTime",   new int(OTodo::AlarmDateTime)    );
 
     // here the custom XML parser from TT it's GPL
     // but we want to push that to TT.....
     QFile f(m_file );
     if (!f.open(IO_ReadOnly) )
         return false;
 
     QByteArray ba = f.readAll();
     f.close();
     char* dt = ba.data();
     int len = ba.size();
     int i = 0;
     char *point;
     const char* collectionString = "<Task ";
     while ( dt+i != 0 && ( point = strstr( dt+i, collectionString ) ) != 0l ) {
         i = point -dt;
         i+= strlen(collectionString);
         OTodo ev;
         m_year = m_month = m_day = 0;
 
         while ( TRUE ) {
             while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') )
 		++i;
 	    if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') )
 		break;
 
 	    // we have another attribute, read it.
 	    int j = i;
 	    while ( j < len && dt[j] != '=' )
 		++j;
 	    QCString attr( dt+i, j-i+1);
 
 	    i = ++j; // skip =
 
 	    // find the start of quotes
 	    while ( i < len && dt[i] != '"' )
 		++i;
 	    j = ++i;
 
 	    bool haveUtf = FALSE;
 	    bool haveEnt = FALSE;
 	    while ( j < len && dt[j] != '"' ) {
 		if ( ((unsigned char)dt[j]) > 0x7f )
 		    haveUtf = TRUE;
 		if ( dt[j] == '&' )
 		    haveEnt = TRUE;
 		++j;
 	    }
 	    if ( i == j ) {
 		// empty value
 		i = j + 1;
 		continue;
 	    }
 
 	    QCString value( dt+i, j-i+1 );
 	    i = j + 1;
 
 	    QString str = (haveUtf ? QString::fromUtf8( value )
 		    : QString::fromLatin1( value ) );
 	    if ( haveEnt )
 		str = Qtopia::plainString( str );
 
             /*
              * add key + value
              */
             todo( &dict, ev, attr, str );
 
         }
         /*
          * now add it
          */
         m_events.insert(ev.uid(), ev );
     }
 
-    qWarning("counts %d", m_events.count() );
+    qWarning("counts %d records loaded!", m_events.count() );
     return true;
 }
 bool OTodoAccessXML::reload() {
     return load();
 }
 bool OTodoAccessXML::save() {
 //    qWarning("saving");
     if (!m_opened || !m_changed ) {
 //        qWarning("not saving");
         return true;
     }
     QString strNewFile = m_file + ".new";
     QFile f( strNewFile );
     if (!f.open( IO_WriteOnly|IO_Raw ) )
         return false;
 
     int written;
     QString out;
     out = "<!DOCTYPE Tasks>\n<Tasks>\n";
 
     // for all todos
     QMap<int, OTodo>::Iterator it;
     for (it = m_events.begin(); it != m_events.end(); ++it ) {
         out+= "<Task " + toString( (*it) ) + " />\n";
         QCString cstr = out.utf8();
         written = f.writeBlock( cstr.data(),  cstr.length() );
 
         /* less written then we wanted */
         if ( written != (int)cstr.length() ) {
             f.close();
             QFile::remove( strNewFile );
             return false;
         }
         out = QString::null;
     }
 
     out +=  "</Tasks>";
     QCString cstr = out.utf8();
     written = f.writeBlock( cstr.data(), cstr.length() );
 
     if ( written != (int)cstr.length() ) {
         f.close();
         QFile::remove( strNewFile );
         return false;
     }
     /* flush before renaming */
     f.close();
 
     if( ::rename( strNewFile.latin1(),  m_file.latin1() ) < 0 ) {
 //        qWarning("error renaming");
         QFile::remove( strNewFile );
     }
 
     m_changed = false;
     return true;
 }
 QArray<int> OTodoAccessXML::allRecords()const {
     QArray<int> ids( m_events.count() );
     QMap<int, OTodo>::ConstIterator it;
     int i = 0;
 
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
         ids[i] = it.key();
         i++;
     }
     return ids;
 }
 QArray<int> OTodoAccessXML::queryByExample( const OTodo&, int ) {
     QArray<int> ids(0);
     return ids;
 }
 OTodo OTodoAccessXML::find( int uid )const {
     OTodo todo;
     todo.setUid( 0 ); // isEmpty()
     QMap<int, OTodo>::ConstIterator it = m_events.find( uid );
     if ( it != m_events.end() )
         todo = it.data();
 
     return todo;
 }
 void OTodoAccessXML::clear() {
     if (m_opened )
         m_changed = true;
 
     m_events.clear();
 }
 bool OTodoAccessXML::add( const OTodo& todo ) {
 //    qWarning("add");
     m_changed = true;
     m_events.insert( todo.uid(), todo );
 
     return true;
 }
 bool OTodoAccessXML::remove( int uid ) {
     m_changed = true;
     m_events.remove( uid );
@@ -425,125 +425,139 @@ struct OTodoXMLContainer {
    *   < 0 (negative integer) if item1 < item2
    *
    */
 class OTodoXMLVector : public QVector<OTodoXMLContainer> {
 public:
     OTodoXMLVector(int size, bool asc,  int sort)
         : QVector<OTodoXMLContainer>( size )
         {
             setAutoDelete( true );
             m_asc = asc;
             m_sort = sort;
         }
         /* return the summary/description */
     QString string( const OTodo& todo) {
         return  todo.summary().isEmpty() ?
             todo.description().left(20 ) :
             todo.summary();
     }
     /**
      * we take the sortorder( switch on it )
      *
      */
     int compareItems( Item d1, Item d2 ) {
         int ret =0;
         OTodoXMLContainer* con1 = (OTodoXMLContainer*)d1;
         OTodoXMLContainer* con2 = (OTodoXMLContainer*)d2;
 
         /* same item */
         if ( con1->todo.uid() == con2->todo.uid() )
             return 0;
 
         switch ( m_sort ) {
             /* completed */
         case 0: {
             ret = 0;
             if ( con1->todo.isCompleted() ) ret++;
             if ( con2->todo.isCompleted() ) ret--;
             break;
         }
             /* priority */
         case 1: {
             ret = con1->todo.priority() - con2->todo.priority();
             qWarning(" priority %d %d %d",  ret,
                      con1->todo.priority(),
                      con2->todo.priority()
                      );
             break;
         }
             /* description */
         case 2: {
             QString str1 = string( con1->todo );
             QString str2 = string( con2->todo );
             ret  = QString::compare( str1, str2 );
             break;
         }
             /* deadline */
         case 3: {
             /* either bot got a dueDate
              * or one of them got one
              */
             if ( con1->todo.hasDueDate() &&
                  con2->todo.hasDueDate() )
                 ret = con1->todo.dueDate().daysTo( con2->todo.dueDate() );
 
 
             else if ( con1->todo.hasDueDate() )
                 ret = -1;
             else if ( con2->todo.hasDueDate() )
                 ret = 0;
             break;
         }
         default:
             ret = 0;
             break;
         };
 
         /* twist it we're not ascending*/
         if (!m_asc)
             ret = ret * -1;
         return ret;
     }
  private:
     bool m_asc;
     int m_sort;
 
 };
 
 QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
                                     int sortFilter,  int cat ) {
     qWarning("sorted! %d cat",  cat);
     OTodoXMLVector vector(m_events.count(), asc,sortOrder );
     QMap<int, OTodo>::Iterator it;
     int item = 0;
 
     bool bCat = sortFilter & 1 ? true : false;
     bool bOnly = sortFilter & 2 ? true : false;
+    bool comp = sortFilter & 4 ? true : false;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
 
         /* show category */
         if ( bCat && cat != 0)
-            if (!(*it).categories().contains( cat ) )
+            if (!(*it).categories().contains( cat ) ) {
+                qWarning("category mis match");
                 continue;
-        /* isOverdue but we should not show overdue */
-        if ( (*it).isOverdue() &&  !bOnly  )
+            }
+        /* isOverdue but we should not show overdue - why?*/
+/*        if ( (*it).isOverdue() &&  !bOnly  ) {
+            qWarning("item is overdue but !bOnly");
+            continue;
+        }
+*/
+        if ( !(*it).isOverdue() && bOnly ) {
+            qWarning("item is not overdue but bOnly checked");
             continue;
-        if ( !(*it).isOverdue() && bOnly )
+        }
+
+        if ((*it).isCompleted() && comp ) {
+            qWarning("completed continue!");
             continue;
+        }
 
 
         OTodoXMLContainer* con = new OTodoXMLContainer();
         con->todo = (*it);
         vector.insert(item, con );
         item++;
     }
+    qWarning("XXX %d Items added", item);
     vector.resize( item );
     /* sort it now */
     vector.sort();
     /* now get the uids */
     QArray<int> array( vector.count() );
     for (uint i= 0; i < vector.count(); i++ ) {
         array[i] = ( vector.at(i) )->todo.uid();
     }
     qWarning("array count = %d %d", array.count(), vector.count() );
     return array;
 };