summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/pim/otodoaccesssql.cpp7
-rw-r--r--libopie2/opiepim/backend/otodoaccesssql.cpp7
2 files changed, 10 insertions, 4 deletions
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp
index 25536e0..8add9f7 100644
--- a/libopie/pim/otodoaccesssql.cpp
+++ b/libopie/pim/otodoaccesssql.cpp
@@ -320,20 +320,22 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
320 * Sort Filter stuff 320 * Sort Filter stuff
321 * not that straight forward 321 * not that straight forward
322 * 322 *
323 */ 323 */
324 /* Category */ 324 /* Category */
325 if ( sortFilter & 1 ) { 325 if ( sortFilter & 1 ) {
326 query += " categories like '%" +QString::number(cat)+"%' AND"; 326 QString str;
327 if (cat != 0 ) str = QString::number( cat );
328 query += " categories like '%" +str+"%' AND";
327 } 329 }
328 /* Show only overdue */ 330 /* Show only overdue */
329 if ( sortFilter & 2 ) { 331 if ( sortFilter & 2 ) {
330 QDate date = QDate::currentDate(); 332 QDate date = QDate::currentDate();
331 QString due; 333 QString due;
332 QString base; 334 QString base;
333 base = QString("DueDate <= '%1-%2-%3' AND WHERE completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() ); 335 base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() );
334 query += " " + base + " AND"; 336 query += " " + base + " AND";
335 } 337 }
336 /* not show completed */ 338 /* not show completed */
337 if ( sortFilter & 4 ) { 339 if ( sortFilter & 4 ) {
338 query += " completed = 0 AND"; 340 query += " completed = 0 AND";
339 }else{ 341 }else{
@@ -440,12 +442,13 @@ void OTodoAccessBackendSQL::update() {
440} 442}
441QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ 443QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
442 444
443 OSQLResultItem::ValueList list = res.results(); 445 OSQLResultItem::ValueList list = res.results();
444 OSQLResultItem::ValueList::Iterator it; 446 OSQLResultItem::ValueList::Iterator it;
445 QArray<int> ints(list.count() ); 447 QArray<int> ints(list.count() );
448 qWarning(" count = %d", list.count() );
446 449
447 int i = 0; 450 int i = 0;
448 for (it = list.begin(); it != list.end(); ++it ) { 451 for (it = list.begin(); it != list.end(); ++it ) {
449 ints[i] = (*it).data("uid").toInt(); 452 ints[i] = (*it).data("uid").toInt();
450 i++; 453 i++;
451 } 454 }
diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp
index 25536e0..8add9f7 100644
--- a/libopie2/opiepim/backend/otodoaccesssql.cpp
+++ b/libopie2/opiepim/backend/otodoaccesssql.cpp
@@ -320,20 +320,22 @@ QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
320 * Sort Filter stuff 320 * Sort Filter stuff
321 * not that straight forward 321 * not that straight forward
322 * 322 *
323 */ 323 */
324 /* Category */ 324 /* Category */
325 if ( sortFilter & 1 ) { 325 if ( sortFilter & 1 ) {
326 query += " categories like '%" +QString::number(cat)+"%' AND"; 326 QString str;
327 if (cat != 0 ) str = QString::number( cat );
328 query += " categories like '%" +str+"%' AND";
327 } 329 }
328 /* Show only overdue */ 330 /* Show only overdue */
329 if ( sortFilter & 2 ) { 331 if ( sortFilter & 2 ) {
330 QDate date = QDate::currentDate(); 332 QDate date = QDate::currentDate();
331 QString due; 333 QString due;
332 QString base; 334 QString base;
333 base = QString("DueDate <= '%1-%2-%3' AND WHERE completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() ); 335 base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() );
334 query += " " + base + " AND"; 336 query += " " + base + " AND";
335 } 337 }
336 /* not show completed */ 338 /* not show completed */
337 if ( sortFilter & 4 ) { 339 if ( sortFilter & 4 ) {
338 query += " completed = 0 AND"; 340 query += " completed = 0 AND";
339 }else{ 341 }else{
@@ -440,12 +442,13 @@ void OTodoAccessBackendSQL::update() {
440} 442}
441QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ 443QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{
442 444
443 OSQLResultItem::ValueList list = res.results(); 445 OSQLResultItem::ValueList list = res.results();
444 OSQLResultItem::ValueList::Iterator it; 446 OSQLResultItem::ValueList::Iterator it;
445 QArray<int> ints(list.count() ); 447 QArray<int> ints(list.count() );
448 qWarning(" count = %d", list.count() );
446 449
447 int i = 0; 450 int i = 0;
448 for (it = list.begin(); it != list.end(); ++it ) { 451 for (it = list.begin(); it != list.end(); ++it ) {
449 ints[i] = (*it).data("uid").toInt(); 452 ints[i] = (*it).data("uid").toInt();
450 i++; 453 i++;
451 } 454 }