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 | |
parent | ac895871f93dce9734189daf9cb95dbbda605096 (diff) | |
download | opie-c13ada0f5e418b25b177e132ff2e1dfe7821577f.zip opie-c13ada0f5e418b25b177e132ff2e1dfe7821577f.tar.gz opie-c13ada0f5e418b25b177e132ff2e1dfe7821577f.tar.bz2 |
implement loading of Recurrence
-rw-r--r-- | libopie/pim/opimnotifymanager.cpp | 3 | ||||
-rw-r--r-- | libopie/pim/opimnotifymanager.h | 3 | ||||
-rw-r--r-- | libopie/pim/orecur.cpp | 2 | ||||
-rw-r--r-- | libopie/pim/otodoaccessxml.cpp | 72 |
4 files changed, 76 insertions, 4 deletions
diff --git a/libopie/pim/opimnotifymanager.cpp b/libopie/pim/opimnotifymanager.cpp index be4a1c2..49af757 100644 --- a/libopie/pim/opimnotifymanager.cpp +++ b/libopie/pim/opimnotifymanager.cpp | |||
@@ -22,48 +22,51 @@ void OPimNotifyManager::remove( const OPimNotify& noti) { | |||
22 | }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) { | 22 | }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) { |
23 | const OPimAlarm& al = static_cast<const OPimAlarm&>(noti); | 23 | const OPimAlarm& al = static_cast<const OPimAlarm&>(noti); |
24 | m_al.remove( al ); | 24 | m_al.remove( al ); |
25 | } | 25 | } |
26 | } | 26 | } |
27 | void OPimNotifyManager::replace( const OPimNotify& noti) { | 27 | void OPimNotifyManager::replace( const OPimNotify& noti) { |
28 | if ( noti.type() == QString::fromLatin1("OPimReminder") ) { | 28 | if ( noti.type() == QString::fromLatin1("OPimReminder") ) { |
29 | const OPimReminder& rem = static_cast<const OPimReminder&>(noti); | 29 | const OPimReminder& rem = static_cast<const OPimReminder&>(noti); |
30 | m_rem.remove( rem ); | 30 | m_rem.remove( rem ); |
31 | m_rem.append( rem ); | 31 | m_rem.append( rem ); |
32 | }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) { | 32 | }else if ( noti.type() == QString::fromLatin1("OPimAlarm") ) { |
33 | const OPimAlarm& al = static_cast<const OPimAlarm&>(noti); | 33 | const OPimAlarm& al = static_cast<const OPimAlarm&>(noti); |
34 | m_al.remove( al ); | 34 | m_al.remove( al ); |
35 | m_al.append( al ); | 35 | m_al.append( al ); |
36 | } | 36 | } |
37 | } | 37 | } |
38 | OPimNotifyManager::Reminders OPimNotifyManager::reminders()const { | 38 | OPimNotifyManager::Reminders OPimNotifyManager::reminders()const { |
39 | return m_rem; | 39 | return m_rem; |
40 | } | 40 | } |
41 | OPimNotifyManager::Alarms OPimNotifyManager::alarms()const { | 41 | OPimNotifyManager::Alarms OPimNotifyManager::alarms()const { |
42 | return m_al; | 42 | return m_al; |
43 | } | 43 | } |
44 | void OPimNotifyManager::setAlarms( const Alarms& al) { | 44 | void OPimNotifyManager::setAlarms( const Alarms& al) { |
45 | m_al = al; | 45 | m_al = al; |
46 | } | 46 | } |
47 | void OPimNotifyManager::setReminders( const Reminders& rem) { | 47 | void OPimNotifyManager::setReminders( const Reminders& rem) { |
48 | m_rem = rem; | 48 | m_rem = rem; |
49 | } | 49 | } |
50 | /* FIXME!!! */ | 50 | /* FIXME!!! */ |
51 | /** | 51 | /** |
52 | * The idea is to check if the provider for our service | 52 | * The idea is to check if the provider for our service |
53 | * is online | 53 | * is online |
54 | * if it is we will use QCOP | 54 | * if it is we will use QCOP |
55 | * if not the Factory to get the backend... | 55 | * if not the Factory to get the backend... |
56 | * Qtopia1.6 services would be kewl to have here.... | 56 | * Qtopia1.6 services would be kewl to have here.... |
57 | */ | 57 | */ |
58 | void OPimNotifyManager::registerNotify( const OPimNotify& ) { | 58 | void OPimNotifyManager::registerNotify( const OPimNotify& ) { |
59 | 59 | ||
60 | } | 60 | } |
61 | /* FIXME!!! */ | 61 | /* FIXME!!! */ |
62 | /** | 62 | /** |
63 | * same as above... | 63 | * same as above... |
64 | * Also implement Url model | 64 | * Also implement Url model |
65 | * have a MainWindow.... | 65 | * have a MainWindow.... |
66 | */ | 66 | */ |
67 | void OPimNotifyManager::deregister( const OPimNotify& ) { | 67 | void OPimNotifyManager::deregister( const OPimNotify& ) { |
68 | 68 | ||
69 | } | 69 | } |
70 | bool OPimNotifyManager::isEmpty()const { | ||
71 | return ( m_rem.isEmpty() && m_al.isEmpty() ); | ||
72 | } | ||
diff --git a/libopie/pim/opimnotifymanager.h b/libopie/pim/opimnotifymanager.h index 0eebc9b..0ac30a1 100644 --- a/libopie/pim/opimnotifymanager.h +++ b/libopie/pim/opimnotifymanager.h | |||
@@ -1,51 +1,54 @@ | |||
1 | #ifndef OPIE_PIM_NOTIFY_MANAGER_H | 1 | #ifndef OPIE_PIM_NOTIFY_MANAGER_H |
2 | #define OPIE_PIM_NOTIFY_MANAGER_H | 2 | #define OPIE_PIM_NOTIFY_MANAGER_H |
3 | 3 | ||
4 | #include <qvaluelist.h> | 4 | #include <qvaluelist.h> |
5 | 5 | ||
6 | #include <opie/opimnotify.h> | 6 | #include <opie/opimnotify.h> |
7 | 7 | ||
8 | /** | 8 | /** |
9 | * The notify manager keeps track of the Notifiers.... | 9 | * The notify manager keeps track of the Notifiers.... |
10 | */ | 10 | */ |
11 | class OPimNotifyManager { | 11 | class OPimNotifyManager { |
12 | public: | 12 | public: |
13 | typedef QValueList<OPimReminder> Reminders; | 13 | typedef QValueList<OPimReminder> Reminders; |
14 | typedef QValueList<OPimAlarm> Alarms; | 14 | typedef QValueList<OPimAlarm> Alarms; |
15 | OPimNotifyManager( const Reminders& rems = Reminders(), const Alarms& alarms = Alarms() ); | 15 | OPimNotifyManager( const Reminders& rems = Reminders(), const Alarms& alarms = Alarms() ); |
16 | ~OPimNotifyManager(); | 16 | ~OPimNotifyManager(); |
17 | 17 | ||
18 | /* we will cast it for you ;) */ | 18 | /* we will cast it for you ;) */ |
19 | void add( const OPimNotify& ); | 19 | void add( const OPimNotify& ); |
20 | void remove( const OPimNotify& ); | 20 | void remove( const OPimNotify& ); |
21 | /* replaces all with this one! */ | 21 | /* replaces all with this one! */ |
22 | void replace( const OPimNotify& ); | 22 | void replace( const OPimNotify& ); |
23 | 23 | ||
24 | Reminders reminders()const; | 24 | Reminders reminders()const; |
25 | Alarms alarms()const; | 25 | Alarms alarms()const; |
26 | 26 | ||
27 | void setAlarms( const Alarms& ); | 27 | void setAlarms( const Alarms& ); |
28 | void setReminders( const Reminders& ); | 28 | void setReminders( const Reminders& ); |
29 | 29 | ||
30 | /* register is a Ansi C keyword... */ | 30 | /* register is a Ansi C keyword... */ |
31 | /** | 31 | /** |
32 | * This function will register the Notify to the Alarm Server | 32 | * This function will register the Notify to the Alarm Server |
33 | * or datebook depending on the type of the notify | 33 | * or datebook depending on the type of the notify |
34 | */ | 34 | */ |
35 | void registerNotify( const OPimNotify& ); | 35 | void registerNotify( const OPimNotify& ); |
36 | 36 | ||
37 | /** | 37 | /** |
38 | * this will do the opposite.. | 38 | * this will do the opposite.. |
39 | */ | 39 | */ |
40 | void deregister( const OPimNotify& ); | 40 | void deregister( const OPimNotify& ); |
41 | 41 | ||
42 | |||
43 | bool isEmpty()const; | ||
44 | |||
42 | private: | 45 | private: |
43 | Reminders m_rem; | 46 | Reminders m_rem; |
44 | Alarms m_al; | 47 | Alarms m_al; |
45 | 48 | ||
46 | class Private; | 49 | class Private; |
47 | Private *d; | 50 | Private *d; |
48 | 51 | ||
49 | }; | 52 | }; |
50 | 53 | ||
51 | #endif | 54 | #endif |
diff --git a/libopie/pim/orecur.cpp b/libopie/pim/orecur.cpp index e3b45b4..eae1fdc 100644 --- a/libopie/pim/orecur.cpp +++ b/libopie/pim/orecur.cpp | |||
@@ -459,52 +459,52 @@ QString ORecur::toString()const { | |||
459 | 459 | ||
460 | buf += " rtype=\""; | 460 | buf += " rtype=\""; |
461 | switch ( data->type ) { | 461 | switch ( data->type ) { |
462 | case ORecur::Daily: | 462 | case ORecur::Daily: |
463 | buf += "Daily"; | 463 | buf += "Daily"; |
464 | break; | 464 | break; |
465 | case ORecur::Weekly: | 465 | case ORecur::Weekly: |
466 | buf += "Weekly"; | 466 | buf += "Weekly"; |
467 | break; | 467 | break; |
468 | case ORecur::MonthlyDay: | 468 | case ORecur::MonthlyDay: |
469 | buf += "MonthlyDay"; | 469 | buf += "MonthlyDay"; |
470 | break; | 470 | break; |
471 | case ORecur::MonthlyDate: | 471 | case ORecur::MonthlyDate: |
472 | buf += "MonthlyDate"; | 472 | buf += "MonthlyDate"; |
473 | break; | 473 | break; |
474 | case ORecur::Yearly: | 474 | case ORecur::Yearly: |
475 | buf += "Yearly"; | 475 | buf += "Yearly"; |
476 | break; | 476 | break; |
477 | default: | 477 | default: |
478 | buf += "NoRepeat"; | 478 | buf += "NoRepeat"; |
479 | break; | 479 | break; |
480 | } | 480 | } |
481 | buf += "\""; | 481 | buf += "\""; |
482 | if (data->days > 0 ) | 482 | if (data->days > 0 ) |
483 | buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\""; | 483 | buf += " rweekdays=\"" + QString::number( static_cast<int>( data->days ) ) + "\""; |
484 | if ( data->pos != 0 ) | 484 | if ( data->pos != 0 ) |
485 | buf += " rposition=\"" + QString::number(data->pos ) + "\""; | 485 | buf += " rposition=\"" + QString::number(data->pos ) + "\""; |
486 | 486 | ||
487 | buf += " rfreq=\"" + QString::number( data->freq ) + "\""; | 487 | buf += " rfreq=\"" + QString::number( data->freq ) + "\""; |
488 | buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\""; | 488 | buf += " rhasenddate=\"" + QString::number( static_cast<int>( data->hasEnd ) ) + "\""; |
489 | if ( data->hasEnd ) | 489 | if ( data->hasEnd ) |
490 | buf += " enddt=\"" | 490 | buf += " enddt=\"" |
491 | + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) | 491 | + QString::number( OTimeZone::utc().fromUTCDateTime( QDateTime( data->end, QTime(12,0,0) ) ) ) |
492 | + "\""; | 492 | + "\""; |
493 | buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\""; | 493 | buf += " created=\"" + QString::number( OTimeZone::utc().fromUTCDateTime( data->create ) ) + "\""; |
494 | 494 | ||
495 | if ( data->list.isEmpty() ) return buf; | 495 | if ( data->list.isEmpty() ) return buf; |
496 | // save exceptions list here!! | 496 | // save exceptions list here!! |
497 | ExceptionList::ConstIterator it; | 497 | ExceptionList::ConstIterator it; |
498 | ExceptionList list = data->list; | 498 | ExceptionList list = data->list; |
499 | buf += " exceptions=\""; | 499 | buf += " exceptions=\""; |
500 | QDate date; | 500 | QDate date; |
501 | for ( it = list.begin(); it != list.end(); ++it ) { | 501 | for ( it = list.begin(); it != list.end(); ++it ) { |
502 | date = (*it); | 502 | date = (*it); |
503 | if ( it != list.begin() ) buf += " "; | 503 | if ( it != list.begin() ) buf += " "; |
504 | 504 | ||
505 | buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); | 505 | buf += QCString().sprintf("%04d%02d%02d", date.year(), date.month(), date.day() ); |
506 | } | 506 | } |
507 | buf += "\""; | 507 | buf += "\" "; |
508 | 508 | ||
509 | return buf; | 509 | return buf; |
510 | } | 510 | } |
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 | |||
@@ -1,233 +1,267 @@ | |||
1 | #include <errno.h> | 1 | #include <errno.h> |
2 | #include <fcntl.h> | 2 | #include <fcntl.h> |
3 | 3 | ||
4 | #include <sys/mman.h> | 4 | #include <sys/mman.h> |
5 | #include <sys/stat.h> | 5 | #include <sys/stat.h> |
6 | #include <sys/types.h> | 6 | #include <sys/types.h> |
7 | 7 | ||
8 | #include <unistd.h> | 8 | #include <unistd.h> |
9 | 9 | ||
10 | 10 | ||
11 | #include <qfile.h> | 11 | #include <qfile.h> |
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) |
28 | return 0; | 46 | return 0; |
29 | 47 | ||
30 | const char* hsearch = haystack; | 48 | const char* hsearch = haystack; |
31 | 49 | ||
32 | if ((needleChar = *needle++) != 0) { | 50 | if ((needleChar = *needle++) != 0) { |
33 | nLen--; //(to make up for needle++) | 51 | nLen--; //(to make up for needle++) |
34 | do { | 52 | do { |
35 | do { | 53 | do { |
36 | if ((haystackChar = *hsearch++) == 0) | 54 | if ((haystackChar = *hsearch++) == 0) |
37 | return (0); | 55 | return (0); |
38 | if (hsearch >= haystack + hLen) | 56 | if (hsearch >= haystack + hLen) |
39 | return (0); | 57 | return (0); |
40 | } while (haystackChar != needleChar); | 58 | } while (haystackChar != needleChar); |
41 | } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0); | 59 | } while (strncmp(hsearch, needle, QMIN(hLen - (hsearch - haystack), nLen)) != 0); |
42 | hsearch--; | 60 | hsearch--; |
43 | } | 61 | } |
44 | return ((char *)hsearch); | 62 | return ((char *)hsearch); |
45 | } | 63 | } |
46 | } | 64 | } |
47 | 65 | ||
48 | 66 | ||
49 | OTodoAccessXML::OTodoAccessXML( const QString& appName, | 67 | OTodoAccessXML::OTodoAccessXML( const QString& appName, |
50 | const QString& fileName ) | 68 | const QString& fileName ) |
51 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) | 69 | : OTodoAccessBackend(), m_app( appName ), m_opened( false ), m_changed( false ) |
52 | { | 70 | { |
53 | if (!fileName.isEmpty() ) | 71 | if (!fileName.isEmpty() ) |
54 | m_file = fileName; | 72 | m_file = fileName; |
55 | else | 73 | else |
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 | */ |
68 | QAsciiDict<int> dict(21); | 87 | QAsciiDict<int> dict(21); |
69 | dict.setAutoDelete( TRUE ); | 88 | dict.setAutoDelete( TRUE ); |
70 | dict.insert("Categories" , new int(OTodo::Category) ); | 89 | dict.insert("Categories" , new int(OTodo::Category) ); |
71 | dict.insert("Uid" , new int(OTodo::Uid) ); | 90 | dict.insert("Uid" , new int(OTodo::Uid) ); |
72 | dict.insert("HasDate" , new int(OTodo::HasDate) ); | 91 | dict.insert("HasDate" , new int(OTodo::HasDate) ); |
73 | dict.insert("Completed" , new int(OTodo::Completed) ); | 92 | dict.insert("Completed" , new int(OTodo::Completed) ); |
74 | dict.insert("Description" , new int(OTodo::Description) ); | 93 | dict.insert("Description" , new int(OTodo::Description) ); |
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; |
95 | if ( fd < 0 ) return false; | 120 | if ( fd < 0 ) return false; |
96 | 121 | ||
97 | if ( fstat(fd, &attribut ) == -1 ) { | 122 | if ( fstat(fd, &attribut ) == -1 ) { |
98 | ::close( fd ); | 123 | ::close( fd ); |
99 | return false; | 124 | return false; |
100 | } | 125 | } |
101 | void* map_addr = ::mmap(NULL, attribut.st_size, PROT_READ, MAP_SHARED, fd, 0 ); | 126 | void* map_addr = ::mmap(NULL, attribut.st_size, PROT_READ, MAP_SHARED, fd, 0 ); |
102 | if ( map_addr == ( (caddr_t)-1) ) { | 127 | if ( map_addr == ( (caddr_t)-1) ) { |
103 | ::close(fd ); | 128 | ::close(fd ); |
104 | return false; | 129 | return false; |
105 | } | 130 | } |
106 | /* advise the kernel who we want to read it */ | 131 | /* advise the kernel who we want to read it */ |
107 | ::madvise( map_addr, attribut.st_size, MADV_SEQUENTIAL ); | 132 | ::madvise( map_addr, attribut.st_size, MADV_SEQUENTIAL ); |
108 | /* we do not the file any more */ | 133 | /* we do not the file any more */ |
109 | ::close( fd ); | 134 | ::close( fd ); |
110 | 135 | ||
111 | char* dt = (char*)map_addr; | 136 | char* dt = (char*)map_addr; |
112 | int len = attribut.st_size; | 137 | int len = attribut.st_size; |
113 | int i = 0; | 138 | int i = 0; |
114 | char *point; | 139 | char *point; |
115 | const char* collectionString = "<Task "; | 140 | const char* collectionString = "<Task "; |
116 | int strLen = strlen(collectionString); | 141 | int strLen = strlen(collectionString); |
117 | while ( ( point = strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0l ) { | 142 | while ( ( point = strstrlen( dt+i, len -i, collectionString, strLen ) ) != 0l ) { |
118 | i = point -dt; | 143 | i = point -dt; |
119 | i+= strLen; | 144 | i+= strLen; |
120 | qWarning("Found a start at %d %d", i, (point-dt) ); | 145 | qWarning("Found a start at %d %d", i, (point-dt) ); |
121 | 146 | ||
122 | OTodo ev; | 147 | OTodo ev; |
123 | m_year = m_month = m_day = 0; | 148 | m_year = m_month = m_day = 0; |
124 | 149 | ||
125 | while ( TRUE ) { | 150 | while ( TRUE ) { |
126 | while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') ) | 151 | while ( i < len && (dt[i] == ' ' || dt[i] == '\n' || dt[i] == '\r') ) |
127 | ++i; | 152 | ++i; |
128 | if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') ) | 153 | if ( i >= len-2 || (dt[i] == '/' && dt[i+1] == '>') ) |
129 | break; | 154 | break; |
130 | 155 | ||
131 | // we have another attribute, read it. | 156 | // we have another attribute, read it. |
132 | int j = i; | 157 | int j = i; |
133 | while ( j < len && dt[j] != '=' ) | 158 | while ( j < len && dt[j] != '=' ) |
134 | ++j; | 159 | ++j; |
135 | QCString attr( dt+i, j-i+1); | 160 | QCString attr( dt+i, j-i+1); |
136 | 161 | ||
137 | i = ++j; // skip = | 162 | i = ++j; // skip = |
138 | 163 | ||
139 | // find the start of quotes | 164 | // find the start of quotes |
140 | while ( i < len && dt[i] != '"' ) | 165 | while ( i < len && dt[i] != '"' ) |
141 | ++i; | 166 | ++i; |
142 | j = ++i; | 167 | j = ++i; |
143 | 168 | ||
144 | bool haveUtf = FALSE; | 169 | bool haveUtf = FALSE; |
145 | bool haveEnt = FALSE; | 170 | bool haveEnt = FALSE; |
146 | while ( j < len && dt[j] != '"' ) { | 171 | while ( j < len && dt[j] != '"' ) { |
147 | if ( ((unsigned char)dt[j]) > 0x7f ) | 172 | if ( ((unsigned char)dt[j]) > 0x7f ) |
148 | haveUtf = TRUE; | 173 | haveUtf = TRUE; |
149 | if ( dt[j] == '&' ) | 174 | if ( dt[j] == '&' ) |
150 | haveEnt = TRUE; | 175 | haveEnt = TRUE; |
151 | ++j; | 176 | ++j; |
152 | } | 177 | } |
153 | if ( i == j ) { | 178 | if ( i == j ) { |
154 | // empty value | 179 | // empty value |
155 | i = j + 1; | 180 | i = j + 1; |
156 | continue; | 181 | continue; |
157 | } | 182 | } |
158 | 183 | ||
159 | QCString value( dt+i, j-i+1 ); | 184 | QCString value( dt+i, j-i+1 ); |
160 | i = j + 1; | 185 | i = j + 1; |
161 | 186 | ||
162 | QString str = (haveUtf ? QString::fromUtf8( value ) | 187 | QString str = (haveUtf ? QString::fromUtf8( value ) |
163 | : QString::fromLatin1( value ) ); | 188 | : QString::fromLatin1( value ) ); |
164 | if ( haveEnt ) | 189 | if ( haveEnt ) |
165 | str = Qtopia::plainString( str ); | 190 | str = Qtopia::plainString( str ); |
166 | 191 | ||
167 | /* | 192 | /* |
168 | * add key + value | 193 | * add key + value |
169 | */ | 194 | */ |
170 | todo( &dict, ev, attr, str ); | 195 | todo( &dict, ev, attr, str ); |
171 | 196 | ||
172 | } | 197 | } |
173 | /* | 198 | /* |
174 | * now add it | 199 | * now add it |
175 | */ | 200 | */ |
176 | qWarning("End at %d", i ); | 201 | qWarning("End at %d", i ); |
177 | if (m_events.contains( ev.uid() ) || ev.uid() == 0) { | 202 | if (m_events.contains( ev.uid() ) || ev.uid() == 0) { |
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; |
192 | } | 226 | } |
193 | bool OTodoAccessXML::reload() { | 227 | bool OTodoAccessXML::reload() { |
194 | m_events.clear(); | 228 | m_events.clear(); |
195 | return load(); | 229 | return load(); |
196 | } | 230 | } |
197 | bool OTodoAccessXML::save() { | 231 | bool OTodoAccessXML::save() { |
198 | // qWarning("saving"); | 232 | // qWarning("saving"); |
199 | if (!m_opened || !m_changed ) { | 233 | if (!m_opened || !m_changed ) { |
200 | // qWarning("not saving"); | 234 | // qWarning("not saving"); |
201 | return true; | 235 | return true; |
202 | } | 236 | } |
203 | QString strNewFile = m_file + ".new"; | 237 | QString strNewFile = m_file + ".new"; |
204 | QFile f( strNewFile ); | 238 | QFile f( strNewFile ); |
205 | if (!f.open( IO_WriteOnly|IO_Raw ) ) | 239 | if (!f.open( IO_WriteOnly|IO_Raw ) ) |
206 | return false; | 240 | return false; |
207 | 241 | ||
208 | int written; | 242 | int written; |
209 | QString out; | 243 | QString out; |
210 | out = "<!DOCTYPE Tasks>\n<Tasks>\n"; | 244 | out = "<!DOCTYPE Tasks>\n<Tasks>\n"; |
211 | 245 | ||
212 | // for all todos | 246 | // for all todos |
213 | QMap<int, OTodo>::Iterator it; | 247 | QMap<int, OTodo>::Iterator it; |
214 | for (it = m_events.begin(); it != m_events.end(); ++it ) { | 248 | for (it = m_events.begin(); it != m_events.end(); ++it ) { |
215 | out+= "<Task " + toString( (*it) ) + " />\n"; | 249 | out+= "<Task " + toString( (*it) ) + " />\n"; |
216 | QCString cstr = out.utf8(); | 250 | QCString cstr = out.utf8(); |
217 | written = f.writeBlock( cstr.data(), cstr.length() ); | 251 | written = f.writeBlock( cstr.data(), cstr.length() ); |
218 | 252 | ||
219 | /* less written then we wanted */ | 253 | /* less written then we wanted */ |
220 | if ( written != (int)cstr.length() ) { | 254 | if ( written != (int)cstr.length() ) { |
221 | f.close(); | 255 | f.close(); |
222 | QFile::remove( strNewFile ); | 256 | QFile::remove( strNewFile ); |
223 | return false; | 257 | return false; |
224 | } | 258 | } |
225 | out = QString::null; | 259 | out = QString::null; |
226 | } | 260 | } |
227 | 261 | ||
228 | out += "</Tasks>"; | 262 | out += "</Tasks>"; |
229 | QCString cstr = out.utf8(); | 263 | QCString cstr = out.utf8(); |
230 | written = f.writeBlock( cstr.data(), cstr.length() ); | 264 | written = f.writeBlock( cstr.data(), cstr.length() ); |
231 | 265 | ||
232 | if ( written != (int)cstr.length() ) { | 266 | if ( written != (int)cstr.length() ) { |
233 | f.close(); | 267 | f.close(); |
@@ -352,136 +386,168 @@ void OTodoAccessXML::todo( QAsciiDict<int>* dict, OTodo& ev, | |||
352 | break; | 386 | break; |
353 | case OTodo::Category: | 387 | case OTodo::Category: |
354 | ev.setCategories( ev.idsFromString( val ) ); | 388 | ev.setCategories( ev.idsFromString( val ) ); |
355 | break; | 389 | break; |
356 | case OTodo::HasDate: | 390 | case OTodo::HasDate: |
357 | ev.setHasDueDate( val.toInt() ); | 391 | ev.setHasDueDate( val.toInt() ); |
358 | break; | 392 | break; |
359 | case OTodo::Completed: | 393 | case OTodo::Completed: |
360 | ev.setCompleted( val.toInt() ); | 394 | ev.setCompleted( val.toInt() ); |
361 | break; | 395 | break; |
362 | case OTodo::Description: | 396 | case OTodo::Description: |
363 | ev.setDescription( val ); | 397 | ev.setDescription( val ); |
364 | break; | 398 | break; |
365 | case OTodo::Summary: | 399 | case OTodo::Summary: |
366 | ev.setSummary( val ); | 400 | ev.setSummary( val ); |
367 | break; | 401 | break; |
368 | case OTodo::Priority: | 402 | case OTodo::Priority: |
369 | ev.setPriority( val.toInt() ); | 403 | ev.setPriority( val.toInt() ); |
370 | break; | 404 | break; |
371 | case OTodo::DateDay: | 405 | case OTodo::DateDay: |
372 | m_day = val.toInt(); | 406 | m_day = val.toInt(); |
373 | break; | 407 | break; |
374 | case OTodo::DateMonth: | 408 | case OTodo::DateMonth: |
375 | m_month = val.toInt(); | 409 | m_month = val.toInt(); |
376 | break; | 410 | break; |
377 | case OTodo::DateYear: | 411 | case OTodo::DateYear: |
378 | m_year = val.toInt(); | 412 | m_year = val.toInt(); |
379 | break; | 413 | break; |
380 | case OTodo::Progress: | 414 | case OTodo::Progress: |
381 | ev.setProgress( val.toInt() ); | 415 | ev.setProgress( val.toInt() ); |
382 | break; | 416 | break; |
383 | case OTodo::CrossReference: | 417 | case OTodo::CrossReference: |
384 | { | 418 | { |
385 | /* | 419 | /* |
386 | * A cross refernce looks like | 420 | * A cross refernce looks like |
387 | * appname,id;appname,id | 421 | * appname,id;appname,id |
388 | * we need to split it up | 422 | * we need to split it up |
389 | */ | 423 | */ |
390 | QStringList refs = QStringList::split(';', val ); | 424 | QStringList refs = QStringList::split(';', val ); |
391 | QStringList::Iterator strIt; | 425 | QStringList::Iterator strIt; |
392 | for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) { | 426 | for (strIt = refs.begin(); strIt != refs.end(); ++strIt ) { |
393 | int pos = (*strIt).find(','); | 427 | int pos = (*strIt).find(','); |
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; |
406 | 471 | ||
407 | str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" "; | 472 | str += "Completed=\"" + QString::number( ev.isCompleted() ) + "\" "; |
408 | str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" "; | 473 | str += "HasDate=\"" + QString::number( ev.hasDueDate() ) + "\" "; |
409 | str += "Priority=\"" + QString::number( ev.priority() ) + "\" "; | 474 | str += "Priority=\"" + QString::number( ev.priority() ) + "\" "; |
410 | str += "Progress=\"" + QString::number(ev.progress() ) + "\" "; | 475 | str += "Progress=\"" + QString::number(ev.progress() ) + "\" "; |
411 | 476 | ||
412 | str += "Categories=\"" + toString( ev.categories() ) + "\" "; | 477 | str += "Categories=\"" + toString( ev.categories() ) + "\" "; |
413 | str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" "; | 478 | str += "Description=\"" + Qtopia::escapeString( ev.description() ) + "\" "; |
414 | str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" "; | 479 | str += "Summary=\"" + Qtopia::escapeString( ev.summary() ) + "\" "; |
415 | 480 | ||
416 | if ( ev.hasDueDate() ) { | 481 | if ( ev.hasDueDate() ) { |
417 | str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" "; | 482 | str += "DateYear=\"" + QString::number( ev.dueDate().year() ) + "\" "; |
418 | str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" "; | 483 | str += "DateMonth=\"" + QString::number( ev.dueDate().month() ) + "\" "; |
419 | str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" "; | 484 | str += "DateDay=\"" + QString::number( ev.dueDate().day() ) + "\" "; |
420 | } | 485 | } |
421 | // qWarning( "Uid %d", ev.uid() ); | 486 | // qWarning( "Uid %d", ev.uid() ); |
422 | str += "Uid=\"" + QString::number( ev.uid() ) + "\" "; | 487 | str += "Uid=\"" + QString::number( ev.uid() ) + "\" "; |
423 | 488 | ||
424 | // append the extra options | 489 | // append the extra options |
425 | /* FIXME Qtopia::Record this is currently not | 490 | /* FIXME Qtopia::Record this is currently not |
426 | * possible you can set custom fields | 491 | * possible you can set custom fields |
427 | * but don' iterate over the list | 492 | * but don' iterate over the list |
428 | * I may do #define private protected | 493 | * I may do #define private protected |
429 | * for this case - cough --zecke | 494 | * for this case - cough --zecke |
430 | */ | 495 | */ |
431 | /* | 496 | /* |
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 | } |
446 | 512 | ||
447 | /* internal class for sorting | 513 | /* internal class for sorting |
448 | * | 514 | * |
449 | * Inspired by todoxmlio.cpp from TT | 515 | * Inspired by todoxmlio.cpp from TT |
450 | */ | 516 | */ |
451 | 517 | ||
452 | struct OTodoXMLContainer { | 518 | struct OTodoXMLContainer { |
453 | OTodo todo; | 519 | OTodo todo; |
454 | }; | 520 | }; |
455 | 521 | ||
456 | namespace { | 522 | namespace { |
457 | inline QString string( const OTodo& todo) { | 523 | inline QString string( const OTodo& todo) { |
458 | return todo.summary().isEmpty() ? | 524 | return todo.summary().isEmpty() ? |
459 | todo.description().left(20 ) : | 525 | todo.description().left(20 ) : |
460 | todo.summary(); | 526 | todo.summary(); |
461 | } | 527 | } |
462 | inline int completed( const OTodo& todo1, const OTodo& todo2) { | 528 | inline int completed( const OTodo& todo1, const OTodo& todo2) { |
463 | int ret = 0; | 529 | int ret = 0; |
464 | if ( todo1.isCompleted() ) ret++; | 530 | if ( todo1.isCompleted() ) ret++; |
465 | if ( todo2.isCompleted() ) ret--; | 531 | if ( todo2.isCompleted() ) ret--; |
466 | return ret; | 532 | return ret; |
467 | } | 533 | } |
468 | inline int priority( const OTodo& t1, const OTodo& t2) { | 534 | inline int priority( const OTodo& t1, const OTodo& t2) { |
469 | return ( t1.priority() - t2.priority() ); | 535 | return ( t1.priority() - t2.priority() ); |
470 | } | 536 | } |
471 | inline int description( const OTodo& t1, const OTodo& t2) { | 537 | inline int description( const OTodo& t1, const OTodo& t2) { |
472 | return QString::compare( string(t1), string(t2) ); | 538 | return QString::compare( string(t1), string(t2) ); |
473 | } | 539 | } |
474 | inline int deadline( const OTodo& t1, const OTodo& t2) { | 540 | inline int deadline( const OTodo& t1, const OTodo& t2) { |
475 | int ret = 0; | 541 | int ret = 0; |
476 | if ( t1.hasDueDate() && | 542 | if ( t1.hasDueDate() && |
477 | t2.hasDueDate() ) | 543 | t2.hasDueDate() ) |
478 | ret = t2.dueDate().daysTo( t1.dueDate() ); | 544 | ret = t2.dueDate().daysTo( t1.dueDate() ); |
479 | else if ( t1.hasDueDate() ) | 545 | else if ( t1.hasDueDate() ) |
480 | ret = -1; | 546 | ret = -1; |
481 | else if ( t2.hasDueDate() ) | 547 | else if ( t2.hasDueDate() ) |
482 | ret = 1; | 548 | ret = 1; |
483 | else | 549 | else |
484 | ret = 0; | 550 | ret = 0; |
485 | 551 | ||
486 | return ret; | 552 | return ret; |
487 | } | 553 | } |