-rw-r--r-- | libkcal/sharpformat.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libkcal/sharpformat.cpp b/libkcal/sharpformat.cpp index d39d2dd..605a54d 100644 --- a/libkcal/sharpformat.cpp +++ b/libkcal/sharpformat.cpp | |||
@@ -64,54 +64,54 @@ class SharpParser : public QObject | |||
64 | { | 64 | { |
65 | public: | 65 | public: |
66 | SharpParser( Calendar *calendar ) : mCalendar( calendar ) { | 66 | SharpParser( Calendar *calendar ) : mCalendar( calendar ) { |
67 | oldCategories = 0; | 67 | oldCategories = 0; |
68 | } | 68 | } |
69 | 69 | ||
70 | bool startElement( Calendar *existingCalendar, const QStringList & attList, QString qName ) | 70 | bool startElement( Calendar *existingCalendar, const QStringList & attList, QString qName ) |
71 | { | 71 | { |
72 | int i = 1; | 72 | int i = 1; |
73 | bool skip = true; | 73 | bool skip = true; |
74 | int max = attList.count() -2; | 74 | int max = attList.count() -2; |
75 | while ( i < max ) { | 75 | while ( i < max ) { |
76 | if ( !attList[i].isEmpty() ) { | 76 | if ( !attList[i].isEmpty() ) { |
77 | skip = false; | 77 | skip = false; |
78 | break; | 78 | break; |
79 | } | 79 | } |
80 | ++i ; | 80 | ++i ; |
81 | } | 81 | } |
82 | if ( skip ) | 82 | if ( skip ) |
83 | return false; | 83 | return false; |
84 | ulong cSum = SharpFormat::getCsum(attList ); | 84 | ulong cSum = SharpFormat::getCsum(attList ); |
85 | 85 | ||
86 | if ( qName == "Event" ) { | 86 | if ( qName == "Event" ) { |
87 | Event *event; | 87 | Event *event; |
88 | event = existingCalendar->event( attList[0].toInt() ); | 88 | event = existingCalendar->event( "Sharp_DTM",attList[0].toInt() ); |
89 | if ( event ) | 89 | if ( event ) |
90 | event = (Event*)event->clone(); | 90 | event = (Event*)event->clone(); |
91 | else | 91 | else |
92 | event = new Event; | 92 | event = new Event; |
93 | event->setZaurusId( attList[0].toInt() ); | 93 | event->setID("Sharp_DTM", attList[0].toInt() ); |
94 | event->setZaurusUid( cSum ); | 94 | event->setZaurusUid( cSum ); |
95 | event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); | 95 | event->setTempSyncStat(SYNC_TEMPSTATE_NEW_EXTERNAL ); |
96 | 96 | ||
97 | event->setSummary( attList[2] ); | 97 | event->setSummary( attList[2] ); |
98 | event->setLocation( attList[3] ); | 98 | event->setLocation( attList[3] ); |
99 | event->setDescription( attList[4] ); | 99 | event->setDescription( attList[4] ); |
100 | if ( attList[7] == "1" ) { | 100 | if ( attList[7] == "1" ) { |
101 | event->setDtStart( QDateTime(fromString( attList[17]+"000000", false ).date(),QTime(0,0,0 ) )); | 101 | event->setDtStart( QDateTime(fromString( attList[17]+"000000", false ).date(),QTime(0,0,0 ) )); |
102 | event->setDtEnd( QDateTime(fromString( attList[18]+"000000", false ).date(),QTime(0,0,0 ))); | 102 | event->setDtEnd( QDateTime(fromString( attList[18]+"000000", false ).date(),QTime(0,0,0 ))); |
103 | event->setFloats( true ); | 103 | event->setFloats( true ); |
104 | } else { | 104 | } else { |
105 | event->setFloats( false ); | 105 | event->setFloats( false ); |
106 | event->setDtStart( fromString( attList[5] ) ); | 106 | event->setDtStart( fromString( attList[5] ) ); |
107 | event->setDtEnd( fromString( attList[6] )); | 107 | event->setDtEnd( fromString( attList[6] )); |
108 | } | 108 | } |
109 | 109 | ||
110 | QString rtype = attList[11]; | 110 | QString rtype = attList[11]; |
111 | if ( rtype != "255" ) { | 111 | if ( rtype != "255" ) { |
112 | // qDebug("recurs "); | 112 | // qDebug("recurs "); |
113 | QDate startDate = event->dtStart().date(); | 113 | QDate startDate = event->dtStart().date(); |
114 | 114 | ||
115 | QString freqStr = attList[12]; | 115 | QString freqStr = attList[12]; |
116 | int freq = freqStr.toInt(); | 116 | int freq = freqStr.toInt(); |
117 | 117 | ||
@@ -168,61 +168,61 @@ class SharpParser : public QObject | |||
168 | } | 168 | } |
169 | 169 | ||
170 | QString categoryList = attList[1] ; | 170 | QString categoryList = attList[1] ; |
171 | event->setCategories( lookupCategories( categoryList ) ); | 171 | event->setCategories( lookupCategories( categoryList ) ); |
172 | 172 | ||
173 | // strange 0 semms to mean: alarm enabled | 173 | // strange 0 semms to mean: alarm enabled |
174 | if ( attList[8] == "0" ) { | 174 | if ( attList[8] == "0" ) { |
175 | Alarm *alarm; | 175 | Alarm *alarm; |
176 | if ( event->alarms().count() > 0 ) | 176 | if ( event->alarms().count() > 0 ) |
177 | alarm = event->alarms().first(); | 177 | alarm = event->alarms().first(); |
178 | else { | 178 | else { |
179 | alarm = new Alarm( event ); | 179 | alarm = new Alarm( event ); |
180 | event->addAlarm( alarm ); | 180 | event->addAlarm( alarm ); |
181 | } | 181 | } |
182 | alarm->setType( Alarm::Audio ); | 182 | alarm->setType( Alarm::Audio ); |
183 | alarm->setEnabled( true ); | 183 | alarm->setEnabled( true ); |
184 | int alarmOffset = attList[9].toInt(); | 184 | int alarmOffset = attList[9].toInt(); |
185 | alarm->setStartOffset( alarmOffset * -60 ); | 185 | alarm->setStartOffset( alarmOffset * -60 ); |
186 | } | 186 | } |
187 | 187 | ||
188 | mCalendar->addEvent( event); | 188 | mCalendar->addEvent( event); |
189 | } else if ( qName == "Todo" ) { | 189 | } else if ( qName == "Todo" ) { |
190 | Todo *todo; | 190 | Todo *todo; |
191 | 191 | ||
192 | todo = existingCalendar->todo( attList[0].toInt() ); | 192 | todo = existingCalendar->todo( "Sharp_DTM", attList[0].toInt() ); |
193 | if (todo ) | 193 | if (todo ) |
194 | todo = (Todo*)todo->clone(); | 194 | todo = (Todo*)todo->clone(); |
195 | else | 195 | else |
196 | todo = new Todo; | 196 | todo = new Todo; |
197 | 197 | ||
198 | //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1 | 198 | //CARDID,CATEGORY,ETDY,LTDY,FNDY,MARK,PRTY,TITL,MEM1 |
199 | // 0 1 2 3 4 5 6 7 8 | 199 | // 0 1 2 3 4 5 6 7 8 |
200 | //1,,,,,1,4,Loch zumachen,"" | 200 | //1,,,,,1,4,Loch zumachen,"" |
201 | //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" " | 201 | //3,Privat,20040317T000000,20040318T000000,20040319T000000,0,5,Call bbb,"notes123 bbb gggg ""bb "" " |
202 | //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes | 202 | //2,"Familie,Freunde,Holiday",20040318T000000,20040324T000000,20040317T000000,1,2,tod2,notes |
203 | 203 | ||
204 | todo->setZaurusId( attList[0].toInt() ); | 204 | todo->setID( "Sharp_DTM", attList[0].toInt() ); |
205 | todo->setZaurusUid( cSum ); | 205 | todo->setZaurusUid( cSum ); |
206 | todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); | 206 | todo->setTempSyncStat( SYNC_TEMPSTATE_NEW_EXTERNAL ); |
207 | 207 | ||
208 | todo->setSummary( attList[7] ); | 208 | todo->setSummary( attList[7] ); |
209 | todo->setDescription( attList[8]); | 209 | todo->setDescription( attList[8]); |
210 | 210 | ||
211 | int priority = attList[6].toInt(); | 211 | int priority = attList[6].toInt(); |
212 | if ( priority == 0 ) priority = 3; | 212 | if ( priority == 0 ) priority = 3; |
213 | todo->setPriority( priority ); | 213 | todo->setPriority( priority ); |
214 | 214 | ||
215 | QString categoryList = attList[1]; | 215 | QString categoryList = attList[1]; |
216 | todo->setCategories( lookupCategories( categoryList ) ); | 216 | todo->setCategories( lookupCategories( categoryList ) ); |
217 | 217 | ||
218 | 218 | ||
219 | 219 | ||
220 | QString hasDateStr = attList[3]; // due | 220 | QString hasDateStr = attList[3]; // due |
221 | if ( !hasDateStr.isEmpty() ) { | 221 | if ( !hasDateStr.isEmpty() ) { |
222 | if ( hasDateStr.right(6) == "000000" ) { | 222 | if ( hasDateStr.right(6) == "000000" ) { |
223 | todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) ); | 223 | todo->setDtDue( QDateTime(fromString( hasDateStr, false ).date(), QTime(0,0,0 )) ); |
224 | todo->setFloats( true ); | 224 | todo->setFloats( true ); |
225 | } | 225 | } |
226 | else { | 226 | else { |
227 | todo->setDtDue( fromString( hasDateStr ) ); | 227 | todo->setDtDue( fromString( hasDateStr ) ); |
228 | todo->setFloats( false ); | 228 | todo->setFloats( false ); |
@@ -445,49 +445,49 @@ int SharpFormat::getNumFromRecord( QString answer, Incidence* inc ) | |||
445 | if ( loopCount > 25 ) { | 445 | if ( loopCount > 25 ) { |
446 | qDebug("KO: Error in while loop"); | 446 | qDebug("KO: Error in while loop"); |
447 | ok = false; | 447 | ok = false; |
448 | start = 0; | 448 | start = 0; |
449 | break; | 449 | break; |
450 | } | 450 | } |
451 | if ( ok ) | 451 | if ( ok ) |
452 | tempString = getPart( answer, ok, start ); | 452 | tempString = getPart( answer, ok, start ); |
453 | if ( start >= len || start == 0 ) { | 453 | if ( start >= len || start == 0 ) { |
454 | start = 0; | 454 | start = 0; |
455 | ok = false; | 455 | ok = false; |
456 | } | 456 | } |
457 | if ( tempString.right(1) =="\n" ) | 457 | if ( tempString.right(1) =="\n" ) |
458 | tempString = tempString.left( tempString.length()-1); | 458 | tempString = tempString.left( tempString.length()-1); |
459 | 459 | ||
460 | templist.append( tempString ); | 460 | templist.append( tempString ); |
461 | } | 461 | } |
462 | ++ccc; | 462 | ++ccc; |
463 | if ( ccc == 2 && loopCount < 25 ) { | 463 | if ( ccc == 2 && loopCount < 25 ) { |
464 | start = 0; | 464 | start = 0; |
465 | bool ok; | 465 | bool ok; |
466 | int newnum = templist[0].toInt( &ok ); | 466 | int newnum = templist[0].toInt( &ok ); |
467 | if ( ok && newnum > 0) { | 467 | if ( ok && newnum > 0) { |
468 | retval = newnum; | 468 | retval = newnum; |
469 | inc->setZaurusId( newnum ); | 469 | inc->setID( "Sharp_DTM",newnum ); |
470 | inc->setZaurusUid( getCsum( templist ) ); | 470 | inc->setZaurusUid( getCsum( templist ) ); |
471 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); | 471 | inc->setTempSyncStat( SYNC_TEMPSTATE_NEW_ID ); |
472 | } | 472 | } |
473 | } | 473 | } |
474 | } | 474 | } |
475 | //qDebug("getNumFromRecord returning : %d ", retval); | 475 | //qDebug("getNumFromRecord returning : %d ", retval); |
476 | return retval; | 476 | return retval; |
477 | } | 477 | } |
478 | bool SharpFormat::save( Calendar *calendar) | 478 | bool SharpFormat::save( Calendar *calendar) |
479 | { | 479 | { |
480 | 480 | ||
481 | QLabel status ( i18n("Processing/adding events ..."), 0 ); | 481 | QLabel status ( i18n("Processing/adding events ..."), 0 ); |
482 | int w = status.sizeHint().width()+20 ; | 482 | int w = status.sizeHint().width()+20 ; |
483 | if ( w < 200 ) w = 200; | 483 | if ( w < 200 ) w = 200; |
484 | int h = status.sizeHint().height()+20 ; | 484 | int h = status.sizeHint().height()+20 ; |
485 | int dw = QApplication::desktop()->width(); | 485 | int dw = QApplication::desktop()->width(); |
486 | int dh = QApplication::desktop()->height(); | 486 | int dh = QApplication::desktop()->height(); |
487 | status.setCaption(i18n("Writing DTM Data") ); | 487 | status.setCaption(i18n("Writing DTM Data") ); |
488 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | 488 | status.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); |
489 | status.show(); | 489 | status.show(); |
490 | status.raise(); | 490 | status.raise(); |
491 | qApp->processEvents(); | 491 | qApp->processEvents(); |
492 | bool debug = DEBUGMODE; | 492 | bool debug = DEBUGMODE; |
493 | QString codec = "utf8"; | 493 | QString codec = "utf8"; |
@@ -499,49 +499,49 @@ bool SharpFormat::save( Calendar *calendar) | |||
499 | Event* ev = er.first(); | 499 | Event* ev = er.first(); |
500 | QString fileName = "/tmp/kopitempout"; | 500 | QString fileName = "/tmp/kopitempout"; |
501 | int i = 0; | 501 | int i = 0; |
502 | QString changeString = ePrefix; | 502 | QString changeString = ePrefix; |
503 | QString deleteString = ePrefix; | 503 | QString deleteString = ePrefix; |
504 | bool deleteEnt = false; | 504 | bool deleteEnt = false; |
505 | bool changeEnt = false; | 505 | bool changeEnt = false; |
506 | QString message = i18n("Processing event # "); | 506 | QString message = i18n("Processing event # "); |
507 | int procCount = 0; | 507 | int procCount = 0; |
508 | while ( ev ) { | 508 | while ( ev ) { |
509 | //qDebug("i %d ", ++i); | 509 | //qDebug("i %d ", ++i); |
510 | if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 510 | if ( ev->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
511 | status.setText ( message + QString::number ( ++procCount ) ); | 511 | status.setText ( message + QString::number ( ++procCount ) ); |
512 | qApp->processEvents(); | 512 | qApp->processEvents(); |
513 | QString eString = getEventString( ev ); | 513 | QString eString = getEventString( ev ); |
514 | if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete | 514 | if ( ev->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete |
515 | // deleting empty strings does not work. | 515 | // deleting empty strings does not work. |
516 | // we write first and x and then delete the record with the x | 516 | // we write first and x and then delete the record with the x |
517 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); | 517 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); |
518 | changeString += eString + "\n"; | 518 | changeString += eString + "\n"; |
519 | deleteString += eString + "\n"; | 519 | deleteString += eString + "\n"; |
520 | deleteEnt = true; | 520 | deleteEnt = true; |
521 | changeEnt = true; | 521 | changeEnt = true; |
522 | } | 522 | } |
523 | else if ( ev->zaurusId() == -1 ) { // add new | 523 | else if ( ev->getID("Sharp_DTM") == -1 ) { // add new |
524 | command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 524 | command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
525 | system ( command.utf8() ); | 525 | system ( command.utf8() ); |
526 | QFile file( fileName ); | 526 | QFile file( fileName ); |
527 | if (!file.open( IO_ReadOnly ) ) { | 527 | if (!file.open( IO_ReadOnly ) ) { |
528 | return false; | 528 | return false; |
529 | 529 | ||
530 | } | 530 | } |
531 | QTextStream ts( &file ); | 531 | QTextStream ts( &file ); |
532 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 532 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
533 | answer = ts.read(); | 533 | answer = ts.read(); |
534 | file.close(); | 534 | file.close(); |
535 | //qDebug("answer \n%s ", answer.latin1()); | 535 | //qDebug("answer \n%s ", answer.latin1()); |
536 | getNumFromRecord( answer, ev ) ; | 536 | getNumFromRecord( answer, ev ) ; |
537 | 537 | ||
538 | } | 538 | } |
539 | else { // change existing | 539 | else { // change existing |
540 | //qDebug("canging %d %d",ev->zaurusStat() ,ev->zaurusId() ); | 540 | //qDebug("canging %d %d",ev->zaurusStat() ,ev->zaurusId() ); |
541 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 541 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
542 | changeString += eString + "\n"; | 542 | changeString += eString + "\n"; |
543 | changeEnt = true; | 543 | changeEnt = true; |
544 | 544 | ||
545 | } | 545 | } |
546 | } | 546 | } |
547 | ev = er.next(); | 547 | ev = er.next(); |
@@ -585,49 +585,49 @@ bool SharpFormat::save( Calendar *calendar) | |||
585 | 585 | ||
586 | changeString = tPrefix; | 586 | changeString = tPrefix; |
587 | deleteString = tPrefix; | 587 | deleteString = tPrefix; |
588 | status.setText ( i18n("Processing todos ...") ); | 588 | status.setText ( i18n("Processing todos ...") ); |
589 | qApp->processEvents(); | 589 | qApp->processEvents(); |
590 | QPtrList<Todo> tl = calendar->rawTodos(); | 590 | QPtrList<Todo> tl = calendar->rawTodos(); |
591 | Todo* to = tl.first(); | 591 | Todo* to = tl.first(); |
592 | i = 0; | 592 | i = 0; |
593 | message = i18n("Processing todo # "); | 593 | message = i18n("Processing todo # "); |
594 | procCount = 0; | 594 | procCount = 0; |
595 | while ( to ) { | 595 | while ( to ) { |
596 | if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { | 596 | if ( to->tempSyncStat() != SYNC_TEMPSTATE_NEW_EXTERNAL ) { |
597 | status.setText ( message + QString::number ( ++procCount ) ); | 597 | status.setText ( message + QString::number ( ++procCount ) ); |
598 | qApp->processEvents(); | 598 | qApp->processEvents(); |
599 | QString eString = getTodoString( to ); | 599 | QString eString = getTodoString( to ); |
600 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete | 600 | if ( to->tempSyncStat() == SYNC_TEMPSTATE_DELETE ) { // delete |
601 | // deleting empty strings does not work. | 601 | // deleting empty strings does not work. |
602 | // we write first and x and then delete the record with the x | 602 | // we write first and x and then delete the record with the x |
603 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); | 603 | eString = eString.replace( QRegExp(",\"\""),",\"x\"" ); |
604 | changeString += eString + "\n"; | 604 | changeString += eString + "\n"; |
605 | deleteString += eString + "\n"; | 605 | deleteString += eString + "\n"; |
606 | deleteEnt = true; | 606 | deleteEnt = true; |
607 | changeEnt = true; | 607 | changeEnt = true; |
608 | } | 608 | } |
609 | else if ( to->zaurusId() == -1 ) { // add new | 609 | else if ( to->getID("Sharp_DTM") == -1 ) { // add new |
610 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; | 610 | command = "(echo \"" + tPrefix + eString + "\" ) | db2file todo -w -g -c " + codec+ " > "+ fileName; |
611 | system ( command.utf8() ); | 611 | system ( command.utf8() ); |
612 | QFile file( fileName ); | 612 | QFile file( fileName ); |
613 | if (!file.open( IO_ReadOnly ) ) { | 613 | if (!file.open( IO_ReadOnly ) ) { |
614 | return false; | 614 | return false; |
615 | 615 | ||
616 | } | 616 | } |
617 | QTextStream ts( &file ); | 617 | QTextStream ts( &file ); |
618 | ts.setCodec( QTextCodec::codecForName("utf8") ); | 618 | ts.setCodec( QTextCodec::codecForName("utf8") ); |
619 | answer = ts.read(); | 619 | answer = ts.read(); |
620 | file.close(); | 620 | file.close(); |
621 | //qDebug("answer \n%s ", answer.latin1()); | 621 | //qDebug("answer \n%s ", answer.latin1()); |
622 | getNumFromRecord( answer, to ) ; | 622 | getNumFromRecord( answer, to ) ; |
623 | 623 | ||
624 | } | 624 | } |
625 | else { // change existing | 625 | else { // change existing |
626 | //qDebug("canging %d %d",to->zaurusStat() ,to->zaurusId() ); | 626 | //qDebug("canging %d %d",to->zaurusStat() ,to->zaurusId() ); |
627 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; | 627 | //command = "(echo \"" + ePrefix + eString + "\" ) | db2file datebook -w -g -c " + codec+ " > "+ fileName; |
628 | changeString += eString + "\n"; | 628 | changeString += eString + "\n"; |
629 | changeEnt = true; | 629 | changeEnt = true; |
630 | 630 | ||
631 | } | 631 | } |
632 | } | 632 | } |
633 | 633 | ||
@@ -675,49 +675,49 @@ QString SharpFormat::dtToString( const QDateTime& dti, bool useTZ ) | |||
675 | { | 675 | { |
676 | QString datestr; | 676 | QString datestr; |
677 | QString timestr; | 677 | QString timestr; |
678 | int offset = KGlobal::locale()->localTimeOffset( dti ); | 678 | int offset = KGlobal::locale()->localTimeOffset( dti ); |
679 | QDateTime dt; | 679 | QDateTime dt; |
680 | if (useTZ) | 680 | if (useTZ) |
681 | dt = dti.addSecs ( -(offset*60)); | 681 | dt = dti.addSecs ( -(offset*60)); |
682 | else | 682 | else |
683 | dt = dti; | 683 | dt = dti; |
684 | if(dt.date().isValid()){ | 684 | if(dt.date().isValid()){ |
685 | const QDate& date = dt.date(); | 685 | const QDate& date = dt.date(); |
686 | datestr.sprintf("%04d%02d%02d", | 686 | datestr.sprintf("%04d%02d%02d", |
687 | date.year(), date.month(), date.day()); | 687 | date.year(), date.month(), date.day()); |
688 | } | 688 | } |
689 | if(dt.time().isValid()){ | 689 | if(dt.time().isValid()){ |
690 | const QTime& time = dt.time(); | 690 | const QTime& time = dt.time(); |
691 | timestr.sprintf("T%02d%02d%02d", | 691 | timestr.sprintf("T%02d%02d%02d", |
692 | time.hour(), time.minute(), time.second()); | 692 | time.hour(), time.minute(), time.second()); |
693 | } | 693 | } |
694 | return datestr + timestr; | 694 | return datestr + timestr; |
695 | } | 695 | } |
696 | QString SharpFormat::getEventString( Event* event ) | 696 | QString SharpFormat::getEventString( Event* event ) |
697 | { | 697 | { |
698 | QStringList list; | 698 | QStringList list; |
699 | list.append( QString::number(event->zaurusId() ) ); | 699 | list.append( QString::number(event->getID("Sharp_DTM") ) ); |
700 | list.append( event->categories().join(",") ); | 700 | list.append( event->categories().join(",") ); |
701 | if ( !event->summary().isEmpty() ) | 701 | if ( !event->summary().isEmpty() ) |
702 | list.append( event->summary() ); | 702 | list.append( event->summary() ); |
703 | else | 703 | else |
704 | list.append("" ); | 704 | list.append("" ); |
705 | if ( !event->location().isEmpty() ) | 705 | if ( !event->location().isEmpty() ) |
706 | list.append( event->location() ); | 706 | list.append( event->location() ); |
707 | else | 707 | else |
708 | list.append("" ); | 708 | list.append("" ); |
709 | if ( !event->description().isEmpty() ) | 709 | if ( !event->description().isEmpty() ) |
710 | list.append( event->description() ); | 710 | list.append( event->description() ); |
711 | else | 711 | else |
712 | list.append( "" ); | 712 | list.append( "" ); |
713 | if ( event->doesFloat () ) { | 713 | if ( event->doesFloat () ) { |
714 | list.append( dtToString( QDateTime(event->dtStart().date(), QTime(0,0,0)), false )); | 714 | list.append( dtToString( QDateTime(event->dtStart().date(), QTime(0,0,0)), false )); |
715 | list.append( dtToString( QDateTime(event->dtEnd().date(),QTime(23,59,59)), false )); //6 | 715 | list.append( dtToString( QDateTime(event->dtEnd().date(),QTime(23,59,59)), false )); //6 |
716 | list.append( "1" ); | 716 | list.append( "1" ); |
717 | 717 | ||
718 | } | 718 | } |
719 | else { | 719 | else { |
720 | list.append( dtToString( event->dtStart()) ); | 720 | list.append( dtToString( event->dtStart()) ); |
721 | list.append( dtToString( event->dtEnd()) ); //6 | 721 | list.append( dtToString( event->dtEnd()) ); //6 |
722 | list.append( "0" ); | 722 | list.append( "0" ); |
723 | } | 723 | } |
@@ -839,49 +839,49 @@ QString SharpFormat::getEventString( Event* event ) | |||
839 | if (event->dtStart().date() == event->dtEnd().date() ) | 839 | if (event->dtStart().date() == event->dtEnd().date() ) |
840 | list.append( "0" ); | 840 | list.append( "0" ); |
841 | else | 841 | else |
842 | list.append( "1" ); | 842 | list.append( "1" ); |
843 | 843 | ||
844 | 844 | ||
845 | for(QStringList::Iterator it=list.begin(); | 845 | for(QStringList::Iterator it=list.begin(); |
846 | it!=list.end(); ++it){ | 846 | it!=list.end(); ++it){ |
847 | QString& s = (*it); | 847 | QString& s = (*it); |
848 | s.replace(QRegExp("\""), "\"\""); | 848 | s.replace(QRegExp("\""), "\"\""); |
849 | if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){ | 849 | if(s.contains(QRegExp("[,\"\r\n]")) || s.stripWhiteSpace() != s){ |
850 | s.prepend('\"'); | 850 | s.prepend('\"'); |
851 | s.append('\"'); | 851 | s.append('\"'); |
852 | } else if(s.isEmpty() && !s.isNull()){ | 852 | } else if(s.isEmpty() && !s.isNull()){ |
853 | s = "\"\""; | 853 | s = "\"\""; |
854 | } | 854 | } |
855 | } | 855 | } |
856 | return list.join(","); | 856 | return list.join(","); |
857 | 857 | ||
858 | 858 | ||
859 | } | 859 | } |
860 | QString SharpFormat::getTodoString( Todo* todo ) | 860 | QString SharpFormat::getTodoString( Todo* todo ) |
861 | { | 861 | { |
862 | QStringList list; | 862 | QStringList list; |
863 | list.append( QString::number( todo->zaurusId() ) ); | 863 | list.append( QString::number( todo->getID("Sharp_DTM") ) ); |
864 | list.append( todo->categories().join(",") ); | 864 | list.append( todo->categories().join(",") ); |
865 | 865 | ||
866 | if ( todo->hasStartDate() ) { | 866 | if ( todo->hasStartDate() ) { |
867 | list.append( dtToString( todo->dtStart()) ); | 867 | list.append( dtToString( todo->dtStart()) ); |
868 | } else | 868 | } else |
869 | list.append( QString() ); | 869 | list.append( QString() ); |
870 | 870 | ||
871 | if ( todo->hasDueDate() ) { | 871 | if ( todo->hasDueDate() ) { |
872 | QTime tim; | 872 | QTime tim; |
873 | if ( todo->doesFloat()) { | 873 | if ( todo->doesFloat()) { |
874 | list.append( dtToString( QDateTime(todo->dtDue().date(),QTime( 0,0,0 )), false)) ; | 874 | list.append( dtToString( QDateTime(todo->dtDue().date(),QTime( 0,0,0 )), false)) ; |
875 | } else { | 875 | } else { |
876 | list.append( dtToString(todo->dtDue() ) ); | 876 | list.append( dtToString(todo->dtDue() ) ); |
877 | } | 877 | } |
878 | } else | 878 | } else |
879 | list.append( QString() ); | 879 | list.append( QString() ); |
880 | 880 | ||
881 | if ( todo->isCompleted() ) { | 881 | if ( todo->isCompleted() ) { |
882 | list.append( dtToString( todo->completed()) ); | 882 | list.append( dtToString( todo->completed()) ); |
883 | list.append( "0" ); // yes 0 == completed | 883 | list.append( "0" ); // yes 0 == completed |
884 | } else { | 884 | } else { |
885 | list.append( dtToString( todo->completed()) ); | 885 | list.append( dtToString( todo->completed()) ); |
886 | list.append( "1" ); | 886 | list.append( "1" ); |
887 | } | 887 | } |