author | zecke <zecke> | 2003-05-07 17:49:07 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-05-07 17:49:07 (UTC) |
commit | c13ada0f5e418b25b177e132ff2e1dfe7821577f (patch) (unidiff) | |
tree | 40e8d6cc67a1de638ef3c278fd827ba0cbea5b76 /libopie/pim/otodoaccessxml.cpp | |
parent | ac895871f93dce9734189daf9cb95dbbda605096 (diff) | |
download | opie-c13ada0f5e418b25b177e132ff2e1dfe7821577f.zip opie-c13ada0f5e418b25b177e132ff2e1dfe7821577f.tar.gz opie-c13ada0f5e418b25b177e132ff2e1dfe7821577f.tar.bz2 |
implement loading of Recurrence
Diffstat (limited to 'libopie/pim/otodoaccessxml.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 72 |
1 files changed, 69 insertions, 3 deletions
diff --git a/libopie/pim/otodoaccessxml.cpp b/libopie/pim/otodoaccessxml.cpp index c0d8dfc..71b6a7e 100644 --- a/libopie/pim/otodoaccessxml.cpp +++ b/libopie/pim/otodoaccessxml.cpp | |||
@@ -12,16 +12,34 @@ | |||
12 | #include <qvector.h> | 12 | #include <qvector.h> |
13 | 13 | ||
14 | #include <qpe/global.h> | 14 | #include <qpe/global.h> |
15 | #include <qpe/stringutil.h> | 15 | #include <qpe/stringutil.h> |
16 | #include <qpe/timeconversion.h> | 16 | #include <qpe/timeconversion.h> |
17 | 17 | ||
18 | #include "otimezone.h" | ||
18 | #include "orecur.h" | 19 | #include "orecur.h" |
19 | #include "otodoaccessxml.h" | 20 | #include "otodoaccessxml.h" |
20 | 21 | ||
21 | namespace { | 22 | namespace { |
23 | time_t rp_end; | ||
24 | ORecur* rec; | ||
25 | ORecur *recur() { | ||
26 | if (!rec ) rec = new ORecur; | ||
27 | return rec; | ||
28 | } | ||
29 | int snd; | ||
30 | enum MoreAttributes { | ||
31 | FRType = OTodo::CompletedDate + 2, | ||
32 | FRWeekdays, | ||
33 | FRPosition, | ||
34 | FRFreq, | ||
35 | FRHasEndDate, | ||
36 | FREndDate, | ||
37 | FRStart, | ||
38 | FREnd | ||
39 | }; | ||
22 | // FROM TT again | 40 | // FROM TT again |
23 | char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen) | 41 | char *strstrlen(const char *haystack, int hLen, const char* needle, int nLen) |
24 | { | 42 | { |
25 | char needleChar; | 43 | char needleChar; |
26 | char haystackChar; | 44 | char haystackChar; |
27 | if (!needle || !haystack || !hLen || !nLen) | 45 | if (!needle || !haystack || !hLen || !nLen) |
@@ -56,12 +74,13 @@ OTodoAccessXML::OTodoAccessXML( const QString& appName, | |||
56 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); | 74 | m_file = Global::applicationFileName( "todolist", "todolist.xml" ); |
57 | } | 75 | } |
58 | OTodoAccessXML::~OTodoAccessXML() { | 76 | OTodoAccessXML::~OTodoAccessXML() { |
59 | 77 | ||
60 | } | 78 | } |
61 | bool OTodoAccessXML::load() { | 79 | bool OTodoAccessXML::load() { |
80 | rec = 0; | ||
62 | m_opened = true; | 81 | m_opened = true; |
63 | m_changed = false; | 82 | m_changed = false; |
64 | /* initialize dict */ | 83 | /* initialize dict */ |
65 | /* | 84 | /* |
66 | * UPDATE dict if you change anything!!! | 85 | * UPDATE dict if you change anything!!! |
67 | */ | 86 | */ |
@@ -75,20 +94,26 @@ bool OTodoAccessXML::load() { | |||
75 | dict.insert("Summary" , new int(OTodo::Summary) ); | 94 | dict.insert("Summary" , new int(OTodo::Summary) ); |
76 | dict.insert("Priority" , new int(OTodo::Priority) ); | 95 | dict.insert("Priority" , new int(OTodo::Priority) ); |
77 | dict.insert("DateDay" , new int(OTodo::DateDay) ); | 96 | dict.insert("DateDay" , new int(OTodo::DateDay) ); |
78 | dict.insert("DateMonth" , new int(OTodo::DateMonth) ); | 97 | dict.insert("DateMonth" , new int(OTodo::DateMonth) ); |
79 | dict.insert("DateYear" , new int(OTodo::DateYear) ); | 98 | dict.insert("DateYear" , new int(OTodo::DateYear) ); |
80 | dict.insert("Progress" , new int(OTodo::Progress) ); | 99 | dict.insert("Progress" , new int(OTodo::Progress) ); |
81 | dict.insert("Completed", new int(OTodo::Completed) ); | 100 | dict.insert("CompletedDate", new int(OTodo::CompletedDate) ); |
82 | dict.insert("CrossReference", new int(OTodo::CrossReference) ); | 101 | dict.insert("CrossReference", new int(OTodo::CrossReference) ); |
83 | dict.insert("State", new int(OTodo::State) ); | 102 | dict.insert("State", new int(OTodo::State) ); |
84 | dict.insert("Recurrence", new int(OTodo::Recurrence) ); | ||
85 | dict.insert("Alarms", new int(OTodo::Alarms) ); | 103 | dict.insert("Alarms", new int(OTodo::Alarms) ); |
86 | dict.insert("Reminders", new int(OTodo::Reminders) ); | 104 | dict.insert("Reminders", new int(OTodo::Reminders) ); |
87 | dict.insert("Notifiers", new int(OTodo::Notifiers) ); | 105 | dict.insert("Notifiers", new int(OTodo::Notifiers) ); |
88 | dict.insert("Maintainer", new int(OTodo::Maintainer) ); | 106 | dict.insert("Maintainer", new int(OTodo::Maintainer) ); |
107 | dict.insert("rtype", new int(FRType) ); | ||
108 | dict.insert("rweekdays", new int(FRWeekdays) ); | ||
109 | dict.insert("rposition", new int(FRPosition) ); | ||
110 | dict.insert("rfreq", new int(FRFreq) ); | ||
111 | dict.insert("start", new int(FRStart) ); | ||
112 | dict.insert("rhasenddate", new int(FRHasEndDate) ); | ||
113 | dict.insert("enddt", new int(FREndDate) ); | ||
89 | 114 | ||
90 | // here the custom XML parser from TT it's GPL | 115 | // here the custom XML parser from TT it's GPL |
91 | // but we want to push OpiePIM... to TT..... | 116 | // but we want to push OpiePIM... to TT..... |
92 | // mmap part from zecke :) | 117 | // mmap part from zecke :) |
93 | int fd = ::open( QFile::encodeName(m_file).data(), O_RDONLY ); | 118 | int fd = ::open( QFile::encodeName(m_file).data(), O_RDONLY ); |
94 | struct stat attribut; | 119 | struct stat attribut; |
@@ -178,14 +203,23 @@ bool OTodoAccessXML::load() { | |||
178 | ev.setUid( 1 ); | 203 | ev.setUid( 1 ); |
179 | m_changed = true; | 204 | m_changed = true; |
180 | } | 205 | } |
181 | if ( ev.hasDueDate() ) { | 206 | if ( ev.hasDueDate() ) { |
182 | ev.setDueDate( QDate(m_year, m_month, m_day) ); | 207 | ev.setDueDate( QDate(m_year, m_month, m_day) ); |
183 | } | 208 | } |
209 | if ( rec && rec->doesRecur() ) { | ||
210 | OTimeZone utc = OTimeZone::utc(); | ||
211 | ORecur recu( *rec ); // call copy c'tor | ||
212 | recu.setEndDate( utc.fromUTCDateTime( rp_end ).date() ); | ||
213 | recu.setStart( ev.dueDate() ); | ||
214 | ev.setRecurrence( recu ); | ||
215 | } | ||
184 | m_events.insert(ev.uid(), ev ); | 216 | m_events.insert(ev.uid(), ev ); |
185 | m_year = m_month = m_day = -1; | 217 | m_year = m_month = m_day = -1; |
218 | delete rec; | ||
219 | rec = 0; | ||
186 | } | 220 | } |
187 | 221 | ||
188 | munmap(map_addr, attribut.st_size ); | 222 | munmap(map_addr, attribut.st_size ); |
189 | 223 | ||
190 | qWarning("counts %d records loaded!", m_events.count() ); | 224 | qWarning("counts %d records loaded!", m_events.count() ); |
191 | return true; | 225 | return true; |
@@ -394,12 +428,43 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
394 | if ( pos > -1 ) | 428 | if ( pos > -1 ) |
395 | ; // ev.addRelation( (*strIt).left(pos), (*strIt).mid(pos+1).toInt() ); | 429 | ; // ev.addRelation( (*strIt).left(pos), (*strIt).mid(pos+1).toInt() ); |
396 | 430 | ||
397 | } | 431 | } |
398 | break; | 432 | break; |
399 | } | 433 | } |
434 | /* Recurrence stuff below + post processing later */ | ||
435 | case FRType: | ||
436 | if ( val == "Daily" ) | ||
437 | recur()->setType( ORecur::Daily ); | ||
438 | else if ( val == "Weekly" ) | ||
439 | recur()->setType( ORecur::Weekly); | ||
440 | else if ( val == "MonthlyDay" ) | ||
441 | recur()->setType( ORecur::MonthlyDay ); | ||
442 | else if ( val == "MonthlyDate" ) | ||
443 | recur()->setType( ORecur::MonthlyDate ); | ||
444 | else if ( val == "Yearly" ) | ||
445 | recur()->setType( ORecur::Yearly ); | ||
446 | else | ||
447 | recur()->setType( ORecur::NoRepeat ); | ||
448 | break; | ||
449 | case FRWeekdays: | ||
450 | recur()->setDays( val.toInt() ); | ||
451 | break; | ||
452 | case FRPosition: | ||
453 | recur()->setPosition( val.toInt() ); | ||
454 | break; | ||
455 | case FRFreq: | ||
456 | recur()->setFrequency( val.toInt() ); | ||
457 | break; | ||
458 | case FRHasEndDate: | ||
459 | recur()->setHasEndDate( val.toInt() ); | ||
460 | break; | ||
461 | case FREndDate: { | ||
462 | rp_end = (time_t) val.toLong(); | ||
463 | break; | ||
464 | } | ||
400 | default: | 465 | default: |
401 | break; | 466 | break; |
402 | } | 467 | } |
403 | } | 468 | } |
404 | QString OTodoAccessXML::toString( const OTodo& ev )const { | 469 | QString OTodoAccessXML::toString( const OTodo& ev )const { |
405 | QString str; | 470 | QString str; |
@@ -432,14 +497,15 @@ QString OTodoAccessXML::toString( const OTodo& ev )const { | |||
432 | QMap<QString, QString> extras = ev.extras(); | 497 | QMap<QString, QString> extras = ev.extras(); |
433 | QMap<QString, QString>::Iterator extIt; | 498 | QMap<QString, QString>::Iterator extIt; |
434 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) | 499 | for (extIt = extras.begin(); extIt != extras.end(); ++extIt ) |
435 | str += extIt.key() + "=\"" + extIt.data() + "\" "; | 500 | str += extIt.key() + "=\"" + extIt.data() + "\" "; |
436 | */ | 501 | */ |
437 | // cross refernce | 502 | // cross refernce |
438 | if ( ev.hasRecurrence() ) | 503 | if ( ev.hasRecurrence() ) { |
439 | str += ev.recurrence().toString(); | 504 | str += ev.recurrence().toString(); |
505 | } | ||
440 | 506 | ||
441 | return str; | 507 | return str; |
442 | } | 508 | } |
443 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { | 509 | QString OTodoAccessXML::toString( const QArray<int>& ints ) const { |
444 | return Qtopia::Record::idsToString( ints ); | 510 | return Qtopia::Record::idsToString( ints ); |
445 | } | 511 | } |