author | zautrix <zautrix> | 2004-10-28 13:13:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-28 13:13:08 (UTC) |
commit | 12068392f1d131c3f599b8854fe131dd9291a5ea (patch) (unidiff) | |
tree | bd49e43036eefde4aa2bdaa9b167b6b8d0e216b0 | |
parent | 849ad402a00e2fe7bfd37c4c452b205767dab3d2 (diff) | |
download | kdepimpi-12068392f1d131c3f599b8854fe131dd9291a5ea.zip kdepimpi-12068392f1d131c3f599b8854fe131dd9291a5ea.tar.gz kdepimpi-12068392f1d131c3f599b8854fe131dd9291a5ea.tar.bz2 |
fixed todo DTM sync
-rw-r--r-- | libkcal/sharpformat.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index d56eab6..b88e729 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -613,54 +613,65 @@ bool SharpFormat::save( Calendar *calendar) | |||
613 | changeString = tPrefix; | 613 | changeString = tPrefix; |
614 | deleteString = tPrefix; | 614 | deleteString = tPrefix; |
615 | status.setText ( i18n("Processing todos ...") ); | 615 | status.setText ( i18n("Processing todos ...") ); |
616 | qApp->processEvents(); | 616 | qApp->processEvents(); |
617 | QPtrList<Todo> tl = calendar->rawTodos(); | 617 | QPtrList<Todo> tl = calendar->rawTodos(); |
618 | Todo* to = tl.first(); | 618 | Todo* to = tl.first(); |
619 | i = 0; | 619 | i = 0; |
620 | message = i18n("Processing todo # "); | 620 | message = i18n("Processing todo # "); |
621 | procCount = 0; | 621 | procCount = 0; |
622 | while ( to ) { | 622 | while ( to ) { |
623 | if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 623 | if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
624 | status.setText ( message + QString::number ( ++procCount ) ); | 624 | status.setText ( message + QString::number ( ++procCount ) ); |
625 | qApp->processEvents(); | 625 | qApp->processEvents(); |
626 | QString eString = getTodoString( to ); | 626 | QString eString = getTodoString( to ); |
627 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete | 627 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete |
628 | // deleting empty strings does not work. | 628 | // deleting empty strings does not work. |
629 | // we write first and x and then delete the record with the x | 629 | // we write first and x and then delete the record with the x |
630 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); | 630 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); |
631 | changeString += eString + "\n"; | 631 | changeString += eString + "\n"; |
632 | deleteString += eString + "\n"; | 632 | deleteString += eString + "\n"; |
633 | deleteEnt = true; | 633 | deleteEnt = true; |
634 | changeEnt = true; | 634 | changeEnt = true; |
635 | } | 635 | } |
636 | else if ( to->getID("Sharp_DTM").isEmpty() ) { // add new | 636 | else if ( to->getID("Sharp_DTM").isEmpty() ) { // add new |
637 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; | 637 | |
638 | |||
639 | |||
640 | QString fileNameIn = "/tmp/kopitempin"; | ||
641 | QFile fileIn( fileNameIn ); | ||
642 | if (!fileIn.open( IO_WriteOnly ) ) { | ||
643 | return false; | ||
644 | } | ||
645 | QTextStream tsIn( &fileIn ); | ||
646 | tsIn.setCodec( QTextCodec::codecForName("utf8") ); | ||
647 | tsIn << tPrefix << eString ; | ||
648 | fileIn.close(); | ||
649 | command = "(cat /tmp/kopitempin | db2file todo -w -g -c " + codec+ ") > "+ fileName; | ||
638 | system ( command.utf8() ); | 650 | system ( command.utf8() ); |
639 | QFile file( fileName ); | 651 | QFile file( fileName ); |
640 | if (!file.open( IO_ReadOnly ) ) { | 652 | if (!file.open( IO_ReadOnly ) ) { |
641 | return false; | 653 | return false; |
642 | |||
643 | } | 654 | } |
644 | QTextStream ts( &file ); | 655 | QTextStream ts( &file ); |
645 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 656 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
646 | answer = ts.read(); | 657 | answer = ts.read(); |
647 | file.close(); | 658 | file.close(); |
648 | //qDebug("answer \n%s ", answer.latin1()); | 659 | //qDebug("answer \n%s ", answer.latin1()); |
649 | getNumFromRecord( answer, to ) ; | 660 | getNumFromRecord( answer, to ) ; |
650 | 661 | ||
651 | } | 662 | } |
652 | else { // change existing | 663 | else { // change existing |
653 | //qDebug("canging %d %d",to->zaurusStat() ,to->zaurusId() ); | 664 | //qDebug("canging %d %d",to->zaurusStat() ,to->zaurusId() ); |
654 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 665 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
655 | changeString += eString + "\n"; | 666 | changeString += eString + "\n"; |
656 | changeEnt = true; | 667 | changeEnt = true; |
657 | 668 | ||
658 | } | 669 | } |
659 | } | 670 | } |
660 | 671 | ||
661 | to = tl.next(); | 672 | to = tl.next(); |
662 | } | 673 | } |
663 | status.setText ( i18n("Changing todos ...") ); | 674 | status.setText ( i18n("Changing todos ...") ); |
664 | qApp->processEvents(); | 675 | qApp->processEvents(); |
665 | //qDebug("changing... "); | 676 | //qDebug("changing... "); |
666 | if ( changeEnt ) { | 677 | if ( changeEnt ) { |