summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore 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
@@ -294,72 +294,74 @@ bool OTodoAccessBackendSQL::remove( int uid ) {
294 * but we need the cache for that 294 * but we need the cache for that
295 * now we remove 295 * now we remove
296 */ 296 */
297bool OTodoAccessBackendSQL::replace( const OTodo& t) { 297bool OTodoAccessBackendSQL::replace( const OTodo& t) {
298 remove( t.uid() ); 298 remove( t.uid() );
299 return add(t); 299 return add(t);
300} 300}
301QArray<int> OTodoAccessBackendSQL::overDue() { 301QArray<int> OTodoAccessBackendSQL::overDue() {
302 OverDueQuery qu; 302 OverDueQuery qu;
303 return uids( m_driver->query(&qu ) ); 303 return uids( m_driver->query(&qu ) );
304} 304}
305QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s, 305QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
306 const QDate& t, 306 const QDate& t,
307 bool u) { 307 bool u) {
308 EffQuery ef(s, t, u ); 308 EffQuery ef(s, t, u );
309 return uids (m_driver->query(&ef) ); 309 return uids (m_driver->query(&ef) );
310} 310}
311/* 311/*
312 * 312 *
313 */ 313 */
314QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder, 314QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
315 int sortFilter, int cat ) { 315 int sortFilter, int cat ) {
316 QString query; 316 QString query;
317 query = "select uid from todolist WHERE "; 317 query = "select uid from todolist WHERE ";
318 318
319 /* 319 /*
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{
340 query += " ( completed = 1 OR completed = 0) AND"; 342 query += " ( completed = 1 OR completed = 0) AND";
341 } 343 }
342 /* srtip the end */ 344 /* srtip the end */
343 query = query.remove( query.length()-3, 3 ); 345 query = query.remove( query.length()-3, 3 );
344 346
345 347
346 /* 348 /*
347 * sort order stuff 349 * sort order stuff
348 * quite straight forward 350 * quite straight forward
349 */ 351 */
350 query += "ORDER BY "; 352 query += "ORDER BY ";
351 switch( sortOrder ) { 353 switch( sortOrder ) {
352 /* completed */ 354 /* completed */
353 case 0: 355 case 0:
354 query += "completed"; 356 query += "completed";
355 break; 357 break;
356 case 1: 358 case 1:
357 query += "priority"; 359 query += "priority";
358 break; 360 break;
359 case 2: 361 case 2:
360 query += "description"; 362 query += "description";
361 break; 363 break;
362 case 3: 364 case 3:
363 query += "DueDate"; 365 query += "DueDate";
364 break; 366 break;
365 } 367 }
@@ -414,41 +416,42 @@ void OTodoAccessBackendSQL::fillDict() {
414 * UPDATE dict if you change anything!!! 416 * UPDATE dict if you change anything!!!
415 */ 417 */
416 m_dict.setAutoDelete( TRUE ); 418 m_dict.setAutoDelete( TRUE );
417 m_dict.insert("Categories" , new int(OTodo::Category) ); 419 m_dict.insert("Categories" , new int(OTodo::Category) );
418 m_dict.insert("Uid" , new int(OTodo::Uid) ); 420 m_dict.insert("Uid" , new int(OTodo::Uid) );
419 m_dict.insert("HasDate" , new int(OTodo::HasDate) ); 421 m_dict.insert("HasDate" , new int(OTodo::HasDate) );
420 m_dict.insert("Completed" , new int(OTodo::Completed) ); 422 m_dict.insert("Completed" , new int(OTodo::Completed) );
421 m_dict.insert("Description" , new int(OTodo::Description) ); 423 m_dict.insert("Description" , new int(OTodo::Description) );
422 m_dict.insert("Summary" , new int(OTodo::Summary) ); 424 m_dict.insert("Summary" , new int(OTodo::Summary) );
423 m_dict.insert("Priority" , new int(OTodo::Priority) ); 425 m_dict.insert("Priority" , new int(OTodo::Priority) );
424 m_dict.insert("DateDay" , new int(OTodo::DateDay) ); 426 m_dict.insert("DateDay" , new int(OTodo::DateDay) );
425 m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); 427 m_dict.insert("DateMonth" , new int(OTodo::DateMonth) );
426 m_dict.insert("DateYear" , new int(OTodo::DateYear) ); 428 m_dict.insert("DateYear" , new int(OTodo::DateYear) );
427 m_dict.insert("Progress" , new int(OTodo::Progress) ); 429 m_dict.insert("Progress" , new int(OTodo::Progress) );
428 m_dict.insert("Completed", new int(OTodo::Completed) ); 430 m_dict.insert("Completed", new int(OTodo::Completed) );
429 m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); 431 m_dict.insert("CrossReference", new int(OTodo::CrossReference) );
430 m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); 432 m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) );
431 m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); 433 m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) );
432} 434}
433void OTodoAccessBackendSQL::update() { 435void OTodoAccessBackendSQL::update() {
434 LoadQuery lo; 436 LoadQuery lo;
435 OSQLResult res = m_driver->query(&lo); 437 OSQLResult res = m_driver->query(&lo);
436 if ( res.state() != OSQLResult::Success ) 438 if ( res.state() != OSQLResult::Success )
437 return; 439 return;
438 440
439 m_uids = uids( res ); 441 m_uids = uids( res );
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 }
452 return ints; 455 return ints;
453} 456}
454 457
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
@@ -294,72 +294,74 @@ bool OTodoAccessBackendSQL::remove( int uid ) {
294 * but we need the cache for that 294 * but we need the cache for that
295 * now we remove 295 * now we remove
296 */ 296 */
297bool OTodoAccessBackendSQL::replace( const OTodo& t) { 297bool OTodoAccessBackendSQL::replace( const OTodo& t) {
298 remove( t.uid() ); 298 remove( t.uid() );
299 return add(t); 299 return add(t);
300} 300}
301QArray<int> OTodoAccessBackendSQL::overDue() { 301QArray<int> OTodoAccessBackendSQL::overDue() {
302 OverDueQuery qu; 302 OverDueQuery qu;
303 return uids( m_driver->query(&qu ) ); 303 return uids( m_driver->query(&qu ) );
304} 304}
305QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s, 305QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s,
306 const QDate& t, 306 const QDate& t,
307 bool u) { 307 bool u) {
308 EffQuery ef(s, t, u ); 308 EffQuery ef(s, t, u );
309 return uids (m_driver->query(&ef) ); 309 return uids (m_driver->query(&ef) );
310} 310}
311/* 311/*
312 * 312 *
313 */ 313 */
314QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder, 314QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder,
315 int sortFilter, int cat ) { 315 int sortFilter, int cat ) {
316 QString query; 316 QString query;
317 query = "select uid from todolist WHERE "; 317 query = "select uid from todolist WHERE ";
318 318
319 /* 319 /*
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{
340 query += " ( completed = 1 OR completed = 0) AND"; 342 query += " ( completed = 1 OR completed = 0) AND";
341 } 343 }
342 /* srtip the end */ 344 /* srtip the end */
343 query = query.remove( query.length()-3, 3 ); 345 query = query.remove( query.length()-3, 3 );
344 346
345 347
346 /* 348 /*
347 * sort order stuff 349 * sort order stuff
348 * quite straight forward 350 * quite straight forward
349 */ 351 */
350 query += "ORDER BY "; 352 query += "ORDER BY ";
351 switch( sortOrder ) { 353 switch( sortOrder ) {
352 /* completed */ 354 /* completed */
353 case 0: 355 case 0:
354 query += "completed"; 356 query += "completed";
355 break; 357 break;
356 case 1: 358 case 1:
357 query += "priority"; 359 query += "priority";
358 break; 360 break;
359 case 2: 361 case 2:
360 query += "description"; 362 query += "description";
361 break; 363 break;
362 case 3: 364 case 3:
363 query += "DueDate"; 365 query += "DueDate";
364 break; 366 break;
365 } 367 }
@@ -414,41 +416,42 @@ void OTodoAccessBackendSQL::fillDict() {
414 * UPDATE dict if you change anything!!! 416 * UPDATE dict if you change anything!!!
415 */ 417 */
416 m_dict.setAutoDelete( TRUE ); 418 m_dict.setAutoDelete( TRUE );
417 m_dict.insert("Categories" , new int(OTodo::Category) ); 419 m_dict.insert("Categories" , new int(OTodo::Category) );
418 m_dict.insert("Uid" , new int(OTodo::Uid) ); 420 m_dict.insert("Uid" , new int(OTodo::Uid) );
419 m_dict.insert("HasDate" , new int(OTodo::HasDate) ); 421 m_dict.insert("HasDate" , new int(OTodo::HasDate) );
420 m_dict.insert("Completed" , new int(OTodo::Completed) ); 422 m_dict.insert("Completed" , new int(OTodo::Completed) );
421 m_dict.insert("Description" , new int(OTodo::Description) ); 423 m_dict.insert("Description" , new int(OTodo::Description) );
422 m_dict.insert("Summary" , new int(OTodo::Summary) ); 424 m_dict.insert("Summary" , new int(OTodo::Summary) );
423 m_dict.insert("Priority" , new int(OTodo::Priority) ); 425 m_dict.insert("Priority" , new int(OTodo::Priority) );
424 m_dict.insert("DateDay" , new int(OTodo::DateDay) ); 426 m_dict.insert("DateDay" , new int(OTodo::DateDay) );
425 m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); 427 m_dict.insert("DateMonth" , new int(OTodo::DateMonth) );
426 m_dict.insert("DateYear" , new int(OTodo::DateYear) ); 428 m_dict.insert("DateYear" , new int(OTodo::DateYear) );
427 m_dict.insert("Progress" , new int(OTodo::Progress) ); 429 m_dict.insert("Progress" , new int(OTodo::Progress) );
428 m_dict.insert("Completed", new int(OTodo::Completed) ); 430 m_dict.insert("Completed", new int(OTodo::Completed) );
429 m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); 431 m_dict.insert("CrossReference", new int(OTodo::CrossReference) );
430 m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); 432 m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) );
431 m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); 433 m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) );
432} 434}
433void OTodoAccessBackendSQL::update() { 435void OTodoAccessBackendSQL::update() {
434 LoadQuery lo; 436 LoadQuery lo;
435 OSQLResult res = m_driver->query(&lo); 437 OSQLResult res = m_driver->query(&lo);
436 if ( res.state() != OSQLResult::Success ) 438 if ( res.state() != OSQLResult::Success )
437 return; 439 return;
438 440
439 m_uids = uids( res ); 441 m_uids = uids( res );
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 }
452 return ints; 455 return ints;
453} 456}
454 457