summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/otodoaccessxml.cpp24
-rw-r--r--libopie2/opiepim/backend/otodoaccessxml.cpp24
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
@@ -119,7 +119,7 @@ bool OTodoAccessXML::load() {
119 m_events.insert(ev.uid(), ev ); 119 m_events.insert(ev.uid(), ev );
120 } 120 }
121 121
122 qWarning("counts %d", m_events.count() ); 122 qWarning("counts %d records loaded!", m_events.count() );
123 return true; 123 return true;
124} 124}
125bool OTodoAccessXML::reload() { 125bool OTodoAccessXML::reload() {
@@ -518,17 +518,30 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
518 518
519 bool bCat = sortFilter & 1 ? true : false; 519 bool bCat = sortFilter & 1 ? true : false;
520 bool bOnly = sortFilter & 2 ? true : false; 520 bool bOnly = sortFilter & 2 ? true : false;
521 bool comp = sortFilter & 4 ? true : false;
521 for ( it = m_events.begin(); it != m_events.end(); ++it ) { 522 for ( it = m_events.begin(); it != m_events.end(); ++it ) {
522 523
523 /* show category */ 524 /* show category */
524 if ( bCat && cat != 0) 525 if ( bCat && cat != 0)
525 if (!(*it).categories().contains( cat ) ) 526 if (!(*it).categories().contains( cat ) ) {
527 qWarning("category mis match");
526 continue; 528 continue;
527 /* isOverdue but we should not show overdue */ 529 }
528 if ( (*it).isOverdue() && !bOnly ) 530 /* isOverdue but we should not show overdue - why?*/
531/* if ( (*it).isOverdue() && !bOnly ) {
532 qWarning("item is overdue but !bOnly");
533 continue;
534 }
535*/
536 if ( !(*it).isOverdue() && bOnly ) {
537 qWarning("item is not overdue but bOnly checked");
529 continue; 538 continue;
530 if ( !(*it).isOverdue() && bOnly ) 539 }
540
541 if ((*it).isCompleted() && comp ) {
542 qWarning("completed continue!");
531 continue; 543 continue;
544 }
532 545
533 546
534 OTodoXMLContainer* con = new OTodoXMLContainer(); 547 OTodoXMLContainer* con = new OTodoXMLContainer();
@@ -536,6 +549,7 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
536 vector.insert(item, con ); 549 vector.insert(item, con );
537 item++; 550 item++;
538 } 551 }
552 qWarning("XXX %d Items added", item);
539 vector.resize( item ); 553 vector.resize( item );
540 /* sort it now */ 554 /* sort it now */
541 vector.sort(); 555 vector.sort();
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
@@ -119,7 +119,7 @@ bool OTodoAccessXML::load() {
119 m_events.insert(ev.uid(), ev ); 119 m_events.insert(ev.uid(), ev );
120 } 120 }
121 121
122 qWarning("counts %d", m_events.count() ); 122 qWarning("counts %d records loaded!", m_events.count() );
123 return true; 123 return true;
124} 124}
125bool OTodoAccessXML::reload() { 125bool OTodoAccessXML::reload() {
@@ -518,17 +518,30 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
518 518
519 bool bCat = sortFilter & 1 ? true : false; 519 bool bCat = sortFilter & 1 ? true : false;
520 bool bOnly = sortFilter & 2 ? true : false; 520 bool bOnly = sortFilter & 2 ? true : false;
521 bool comp = sortFilter & 4 ? true : false;
521 for ( it = m_events.begin(); it != m_events.end(); ++it ) { 522 for ( it = m_events.begin(); it != m_events.end(); ++it ) {
522 523
523 /* show category */ 524 /* show category */
524 if ( bCat && cat != 0) 525 if ( bCat && cat != 0)
525 if (!(*it).categories().contains( cat ) ) 526 if (!(*it).categories().contains( cat ) ) {
527 qWarning("category mis match");
526 continue; 528 continue;
527 /* isOverdue but we should not show overdue */ 529 }
528 if ( (*it).isOverdue() && !bOnly ) 530 /* isOverdue but we should not show overdue - why?*/
531/* if ( (*it).isOverdue() && !bOnly ) {
532 qWarning("item is overdue but !bOnly");
533 continue;
534 }
535*/
536 if ( !(*it).isOverdue() && bOnly ) {
537 qWarning("item is not overdue but bOnly checked");
529 continue; 538 continue;
530 if ( !(*it).isOverdue() && bOnly ) 539 }
540
541 if ((*it).isCompleted() && comp ) {
542 qWarning("completed continue!");
531 continue; 543 continue;
544 }
532 545
533 546
534 OTodoXMLContainer* con = new OTodoXMLContainer(); 547 OTodoXMLContainer* con = new OTodoXMLContainer();
@@ -536,6 +549,7 @@ QArray<int> OTodoAccessXML::sorted( bool asc, int sortOrder,
536 vector.insert(item, con ); 549 vector.insert(item, con );
537 item++; 550 item++;
538 } 551 }
552 qWarning("XXX %d Items added", item);
539 vector.resize( item ); 553 vector.resize( item );
540 /* sort it now */ 554 /* sort it now */
541 vector.sort(); 555 vector.sort();