2 files changed, 38 insertions, 10 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
@@ -121,3 +121,3 @@ bool OTodoAccessXML::load() {
 
-    qWarning("counts %d", m_events.count() );
+    qWarning("counts %d records loaded!", m_events.count() );
     return true;
@@ -520,2 +520,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
     bool bOnly = sortFilter & 2 ? true : false;
+    bool comp = sortFilter & 4 ? true : false;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -524,9 +525,21 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
         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;
+        }
 
@@ -538,2 +551,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
     }
+    qWarning("XXX %d Items added", item);
     vector.resize( item );
diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp
index 3b4cab2..7a55c67 100644
--- a/libopie2/opiepim/backend/otodoaccessxml.cpp
+++ b/libopie2/opiepim/backend/otodoaccessxml.cpp
@@ -121,3 +121,3 @@ bool OTodoAccessXML::load() {
 
-    qWarning("counts %d", m_events.count() );
+    qWarning("counts %d records loaded!", m_events.count() );
     return true;
@@ -520,2 +520,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
     bool bOnly = sortFilter & 2 ? true : false;
+    bool comp = sortFilter & 4 ? true : false;
     for ( it = m_events.begin(); it != m_events.end(); ++it ) {
@@ -524,9 +525,21 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
         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;
+        }
 
@@ -538,2 +551,3 @@ QArray<int> OTodoAccessXML::sorted( bool asc,  int sortOrder,
     }
+    qWarning("XXX %d Items added", item);
     vector.resize( item );