-rw-r--r-- | libopie/pim/opimaccessbackend.h | 16 | ||||
-rw-r--r-- | libopie/pim/opimaccesstemplate.h | 7 | ||||
-rw-r--r-- | libopie/pim/otodoaccesssql.cpp | 2 |
3 files changed, 22 insertions, 3 deletions
diff --git a/libopie/pim/opimaccessbackend.h b/libopie/pim/opimaccessbackend.h index 27d3cb8..0bd2723 100644 --- a/libopie/pim/opimaccessbackend.h +++ b/libopie/pim/opimaccessbackend.h | |||
@@ -1,127 +1,141 @@ | |||
1 | #ifndef OPIE_PIM_ACCESS_BACKEND | 1 | #ifndef OPIE_PIM_ACCESS_BACKEND |
2 | #define OPIE_PIM_ACCESS_BACKEND | 2 | #define OPIE_PIM_ACCESS_BACKEND |
3 | 3 | ||
4 | #include <qarray.h> | 4 | #include <qarray.h> |
5 | 5 | ||
6 | #include <opie/otemplatebase.h> | 6 | #include <opie/otemplatebase.h> |
7 | #include <opie/opimrecord.h> | 7 | #include <opie/opimrecord.h> |
8 | 8 | ||
9 | 9 | ||
10 | /** | 10 | /** |
11 | * OPimAccessBackend is the base class | 11 | * OPimAccessBackend is the base class |
12 | * for all private backends | 12 | * for all private backends |
13 | * it operates on OPimRecord as the base class | 13 | * it operates on OPimRecord as the base class |
14 | * and it's responsible for fast manipulating | 14 | * and it's responsible for fast manipulating |
15 | * the resource the implementation takes care | 15 | * the resource the implementation takes care |
16 | * of | 16 | * of |
17 | */ | 17 | */ |
18 | template <class T = OPimRecord> | 18 | template <class T = OPimRecord> |
19 | class OPimAccessBackend { | 19 | class OPimAccessBackend { |
20 | public: | 20 | public: |
21 | typedef OTemplateBase<T> Frontend; | 21 | typedef OTemplateBase<T> Frontend; |
22 | OPimAccessBackend(); | 22 | OPimAccessBackend(); |
23 | virtual ~OPimAccessBackend(); | 23 | virtual ~OPimAccessBackend(); |
24 | 24 | ||
25 | /** | 25 | /** |
26 | * load the resource | 26 | * load the resource |
27 | */ | 27 | */ |
28 | virtual bool load() = 0; | 28 | virtual bool load() = 0; |
29 | 29 | ||
30 | /** | 30 | /** |
31 | * reload the resource | 31 | * reload the resource |
32 | */ | 32 | */ |
33 | virtual bool reload() = 0; | 33 | virtual bool reload() = 0; |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * save the resource and | 36 | * save the resource and |
37 | * all it's changes | 37 | * all it's changes |
38 | */ | 38 | */ |
39 | virtual bool save() = 0; | 39 | virtual bool save() = 0; |
40 | 40 | ||
41 | /** | 41 | /** |
42 | * return an array of | 42 | * return an array of |
43 | * all available uids | 43 | * all available uids |
44 | */ | 44 | */ |
45 | virtual QArray<int> allRecords()const = 0; | 45 | virtual QArray<int> allRecords()const = 0; |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * queryByExample for T with the SortOrder | 48 | * queryByExample for T with the SortOrder |
49 | * sort | 49 | * sort |
50 | */ | 50 | */ |
51 | virtual QArray<int> queryByExample( const T& t, int sort ) = 0; | 51 | virtual QArray<int> queryByExample( const T& t, int sort ) = 0; |
52 | 52 | ||
53 | /** | 53 | /** |
54 | * find the OPimRecord with uid @param uid | 54 | * find the OPimRecord with uid @param uid |
55 | * returns T and T.isEmpty() if nothing was found | 55 | * returns T and T.isEmpty() if nothing was found |
56 | */ | 56 | */ |
57 | virtual T find(int uid )const = 0; | 57 | virtual T find(int uid )const = 0; |
58 | 58 | ||
59 | virtual T find(int uid, const QArray<int>& items, | 59 | virtual T find(int uid, const QArray<int>& items, |
60 | uint current, Frontend::CacheDirection )const ; | 60 | uint current, Frontend::CacheDirection )const ; |
61 | /** | 61 | /** |
62 | * clear the back end | 62 | * clear the back end |
63 | */ | 63 | */ |
64 | virtual void clear() = 0; | 64 | virtual void clear() = 0; |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * add T | 67 | * add T |
68 | */ | 68 | */ |
69 | virtual bool add( const T& t ) = 0; | 69 | virtual bool add( const T& t ) = 0; |
70 | 70 | ||
71 | /** | 71 | /** |
72 | * remove | 72 | * remove |
73 | */ | 73 | */ |
74 | virtual bool remove( int uid ) = 0; | 74 | virtual bool remove( int uid ) = 0; |
75 | 75 | ||
76 | /** | 76 | /** |
77 | * replace a record with T.uid() | 77 | * replace a record with T.uid() |
78 | */ | 78 | */ |
79 | virtual bool replace( const T& t ) = 0; | 79 | virtual bool replace( const T& t ) = 0; |
80 | 80 | ||
81 | /* | 81 | /* |
82 | * setTheFrontEnd!!! | 82 | * setTheFrontEnd!!! |
83 | */ | 83 | */ |
84 | void setFrontend( Frontend* front ); | 84 | void setFrontend( Frontend* front ); |
85 | 85 | ||
86 | /** | ||
87 | * set the read ahead count | ||
88 | */ | ||
89 | void setReadAhead( uint count ); | ||
86 | protected: | 90 | protected: |
87 | void cache( const T& t )const; | 91 | void cache( const T& t )const; |
88 | 92 | ||
89 | /** | 93 | /** |
90 | * use a prime number here! | 94 | * use a prime number here! |
91 | */ | 95 | */ |
92 | void setSaneCacheSize( int ); | 96 | void setSaneCacheSize( int ); |
93 | 97 | ||
98 | uint readAhead()const; | ||
99 | |||
94 | private: | 100 | private: |
95 | Frontend* m_front; | 101 | Frontend* m_front; |
102 | uint m_read; | ||
96 | 103 | ||
97 | }; | 104 | }; |
98 | 105 | ||
99 | template <class T> | 106 | template <class T> |
100 | OPimAccessBackend<T>::OPimAccessBackend() { | 107 | OPimAccessBackend<T>::OPimAccessBackend() { |
101 | m_front = 0l; | 108 | m_front = 0l; |
102 | } | 109 | } |
103 | template <class T> | 110 | template <class T> |
104 | OPimAccessBackend<T>::~OPimAccessBackend() { | 111 | OPimAccessBackend<T>::~OPimAccessBackend() { |
105 | 112 | ||
106 | } | 113 | } |
107 | template <class T> | 114 | template <class T> |
108 | void OPimAccessBackend<T>::setFrontend( Frontend* fr ) { | 115 | void OPimAccessBackend<T>::setFrontend( Frontend* fr ) { |
109 | m_front = fr; | 116 | m_front = fr; |
110 | } | 117 | } |
111 | template <class T> | 118 | template <class T> |
112 | void OPimAccessBackend<T>::cache( const T& t )const { | 119 | void OPimAccessBackend<T>::cache( const T& t )const { |
113 | if (m_front ) | 120 | if (m_front ) |
114 | m_front->cache( t ); | 121 | m_front->cache( t ); |
115 | } | 122 | } |
116 | template <class T> | 123 | template <class T> |
117 | void OPimAccessBackend<T>::setSaneCacheSize( int size) { | 124 | void OPimAccessBackend<T>::setSaneCacheSize( int size) { |
118 | if (m_front ) | 125 | if (m_front ) |
119 | m_front->setSaneCacheSize( size ); | 126 | m_front->setSaneCacheSize( size ); |
120 | } | 127 | } |
121 | template <class T> | 128 | template <class T> |
122 | T OPimAccessBackend<T>::find( int uid, const QArray<int>&, | 129 | T OPimAccessBackend<T>::find( int uid, const QArray<int>&, |
123 | uint, Frontend::CacheDirection )const { | 130 | uint, Frontend::CacheDirection )const { |
124 | return find( uid ); | 131 | return find( uid ); |
125 | } | 132 | } |
126 | 133 | template <class T> | |
134 | void OPimAccessBackend<T>::setReadAhead( uint count ) { | ||
135 | m_read = count; | ||
136 | } | ||
137 | template <class T> | ||
138 | uint OPimAccessBackend<T>::readAhead()const { | ||
139 | return m_read; | ||
140 | } | ||
127 | #endif | 141 | #endif |
diff --git a/libopie/pim/opimaccesstemplate.h b/libopie/pim/opimaccesstemplate.h index 50cb1e4..c5523a8 100644 --- a/libopie/pim/opimaccesstemplate.h +++ b/libopie/pim/opimaccesstemplate.h | |||
@@ -1,254 +1,259 @@ | |||
1 | #ifndef OPIE_PIM_ACCESS_TEMPLATE_H | 1 | #ifndef OPIE_PIM_ACCESS_TEMPLATE_H |
2 | #define OPIE_PIM_ACCESS_TEMPLATE_H | 2 | #define OPIE_PIM_ACCESS_TEMPLATE_H |
3 | 3 | ||
4 | #include <qarray.h> | 4 | #include <qarray.h> |
5 | 5 | ||
6 | #include <opie/opimrecord.h> | 6 | #include <opie/opimrecord.h> |
7 | #include <opie/opimaccessbackend.h> | 7 | #include <opie/opimaccessbackend.h> |
8 | #include <opie/orecordlist.h> | 8 | #include <opie/orecordlist.h> |
9 | 9 | ||
10 | #include "opimcache.h" | 10 | #include "opimcache.h" |
11 | #include "otemplatebase.h" | 11 | #include "otemplatebase.h" |
12 | 12 | ||
13 | /** | 13 | /** |
14 | * Thats the frontend to our OPIE PIM | 14 | * Thats the frontend to our OPIE PIM |
15 | * Library. Either you want to use it's | 15 | * Library. Either you want to use it's |
16 | * interface or you want to implement | 16 | * interface or you want to implement |
17 | * your own Access lib | 17 | * your own Access lib |
18 | * Just create a OPimRecord and inherit from | 18 | * Just create a OPimRecord and inherit from |
19 | * the plugins | 19 | * the plugins |
20 | */ | 20 | */ |
21 | 21 | ||
22 | template <class T = OPimRecord > | 22 | template <class T = OPimRecord > |
23 | class OPimAccessTemplate : public OTemplateBase<T> { | 23 | class OPimAccessTemplate : public OTemplateBase<T> { |
24 | public: | 24 | public: |
25 | typedef ORecordList<T> List; | 25 | typedef ORecordList<T> List; |
26 | typedef OPimAccessBackend<T> BackEnd; | 26 | typedef OPimAccessBackend<T> BackEnd; |
27 | typedef OPimCache<T> Cache; | 27 | typedef OPimCache<T> Cache; |
28 | 28 | ||
29 | /** | 29 | /** |
30 | * c'tor BackEnd | 30 | * c'tor BackEnd |
31 | */ | 31 | */ |
32 | OPimAccessTemplate( BackEnd* end); | 32 | OPimAccessTemplate( BackEnd* end); |
33 | virtual ~OPimAccessTemplate(); | 33 | virtual ~OPimAccessTemplate(); |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * load from the backend | 36 | * load from the backend |
37 | */ | 37 | */ |
38 | virtual bool load(); | 38 | virtual bool load(); |
39 | 39 | ||
40 | /** Reload database. | 40 | /** Reload database. |
41 | * You should execute this function if the external database | 41 | * You should execute this function if the external database |
42 | * was changed. | 42 | * was changed. |
43 | * This function will load the external database and afterwards | 43 | * This function will load the external database and afterwards |
44 | * rejoin the local changes. Therefore the local database will be set consistent. | 44 | * rejoin the local changes. Therefore the local database will be set consistent. |
45 | */ | 45 | */ |
46 | virtual bool reload(); | 46 | virtual bool reload(); |
47 | 47 | ||
48 | /** Save contacts database. | 48 | /** Save contacts database. |
49 | * Save is more a "commit". After calling this function, all changes are public available. | 49 | * Save is more a "commit". After calling this function, all changes are public available. |
50 | * @return true if successful | 50 | * @return true if successful |
51 | */ | 51 | */ |
52 | virtual bool save(); | 52 | virtual bool save(); |
53 | 53 | ||
54 | /** | 54 | /** |
55 | * if the resource was changed externally | 55 | * if the resource was changed externally |
56 | * You should use the signal handling instead of polling possible changes ! | 56 | * You should use the signal handling instead of polling possible changes ! |
57 | * zecke: Do you implement a signal for otodoaccess ? | 57 | * zecke: Do you implement a signal for otodoaccess ? |
58 | */ | 58 | */ |
59 | bool wasChangedExternally()const; | 59 | bool wasChangedExternally()const; |
60 | 60 | ||
61 | /** | 61 | /** |
62 | * return a List of records | 62 | * return a List of records |
63 | * you can iterate over them | 63 | * you can iterate over them |
64 | */ | 64 | */ |
65 | virtual List allRecords()const; | 65 | virtual List allRecords()const; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * queryByExample. | 68 | * queryByExample. |
69 | * @see otodoaccess, ocontactaccess | 69 | * @see otodoaccess, ocontactaccess |
70 | */ | 70 | */ |
71 | virtual List queryByExample( const T& t, int querySettings ); | 71 | virtual List queryByExample( const T& t, int querySettings ); |
72 | 72 | ||
73 | /** | 73 | /** |
74 | * find the OPimRecord uid | 74 | * find the OPimRecord uid |
75 | */ | 75 | */ |
76 | virtual T find( int uid )const; | 76 | virtual T find( int uid )const; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * read ahead cache find method ;) | 79 | * read ahead cache find method ;) |
80 | */ | 80 | */ |
81 | virtual T find( int uid, const QArray<int>&, | 81 | virtual T find( int uid, const QArray<int>&, |
82 | uint current, CacheDirection dir = Forward )const; | 82 | uint current, CacheDirection dir = Forward )const; |
83 | 83 | ||
84 | /* invalidate cache here */ | 84 | /* invalidate cache here */ |
85 | /** | 85 | /** |
86 | * clears the backend and invalidates the backend | 86 | * clears the backend and invalidates the backend |
87 | */ | 87 | */ |
88 | virtual void clear() ; | 88 | virtual void clear() ; |
89 | 89 | ||
90 | /** | 90 | /** |
91 | * add T to the backend | 91 | * add T to the backend |
92 | * @param t The item to add. | 92 | * @param t The item to add. |
93 | * @return <i>true</i> if added successfully. | 93 | * @return <i>true</i> if added successfully. |
94 | */ | 94 | */ |
95 | virtual bool add( const T& t ) ; | 95 | virtual bool add( const T& t ) ; |
96 | 96 | ||
97 | /* only the uid matters */ | 97 | /* only the uid matters */ |
98 | /** | 98 | /** |
99 | * remove T from the backend | 99 | * remove T from the backend |
100 | * @param t The item to remove | 100 | * @param t The item to remove |
101 | * @return <i>true</i> if successful. | 101 | * @return <i>true</i> if successful. |
102 | */ | 102 | */ |
103 | virtual bool remove( const T& t ); | 103 | virtual bool remove( const T& t ); |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * remove the OPimRecord with uid | 106 | * remove the OPimRecord with uid |
107 | * @param uid The ID of the item to remove | 107 | * @param uid The ID of the item to remove |
108 | * @return <i>true</i> if successful. | 108 | * @return <i>true</i> if successful. |
109 | */ | 109 | */ |
110 | virtual bool remove( int uid ); | 110 | virtual bool remove( int uid ); |
111 | 111 | ||
112 | /** | 112 | /** |
113 | * replace T from backend | 113 | * replace T from backend |
114 | * @param t The item to replace | 114 | * @param t The item to replace |
115 | * @return <i>true</i> if successful. | 115 | * @return <i>true</i> if successful. |
116 | */ | 116 | */ |
117 | virtual bool replace( const T& t) ; | 117 | virtual bool replace( const T& t) ; |
118 | 118 | ||
119 | void setReadAhead( uint count ); | ||
119 | /** | 120 | /** |
120 | * @internal | 121 | * @internal |
121 | */ | 122 | */ |
122 | void cache( const T& )const; | 123 | void cache( const T& )const; |
123 | void setSaneCacheSize( int ); | 124 | void setSaneCacheSize( int ); |
124 | protected: | 125 | protected: |
125 | /** | 126 | /** |
126 | * invalidate the cache | 127 | * invalidate the cache |
127 | */ | 128 | */ |
128 | void invalidateCache(); | 129 | void invalidateCache(); |
129 | 130 | ||
130 | void setBackEnd( BackEnd* end ); | 131 | void setBackEnd( BackEnd* end ); |
131 | /** | 132 | /** |
132 | * returns the backend | 133 | * returns the backend |
133 | */ | 134 | */ |
134 | BackEnd* backEnd(); | 135 | BackEnd* backEnd(); |
135 | BackEnd* m_backEnd; | 136 | BackEnd* m_backEnd; |
136 | Cache m_cache; | 137 | Cache m_cache; |
137 | 138 | ||
138 | }; | 139 | }; |
139 | 140 | ||
140 | template <class T> | 141 | template <class T> |
141 | OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end ) | 142 | OPimAccessTemplate<T>::OPimAccessTemplate( BackEnd* end ) |
142 | : OTemplateBase<T>(), m_backEnd( end ) | 143 | : OTemplateBase<T>(), m_backEnd( end ) |
143 | { | 144 | { |
144 | if (end ) | 145 | if (end ) |
145 | end->setFrontend( this ); | 146 | end->setFrontend( this ); |
146 | } | 147 | } |
147 | template <class T> | 148 | template <class T> |
148 | OPimAccessTemplate<T>::~OPimAccessTemplate() { | 149 | OPimAccessTemplate<T>::~OPimAccessTemplate() { |
149 | qWarning("~OPimAccessTemplate<T>"); | 150 | qWarning("~OPimAccessTemplate<T>"); |
150 | delete m_backEnd; | 151 | delete m_backEnd; |
151 | } | 152 | } |
152 | template <class T> | 153 | template <class T> |
153 | bool OPimAccessTemplate<T>::load() { | 154 | bool OPimAccessTemplate<T>::load() { |
154 | invalidateCache(); | 155 | invalidateCache(); |
155 | return m_backEnd->load(); | 156 | return m_backEnd->load(); |
156 | } | 157 | } |
157 | template <class T> | 158 | template <class T> |
158 | bool OPimAccessTemplate<T>::reload() { | 159 | bool OPimAccessTemplate<T>::reload() { |
159 | invalidateCache(); // zecke: I think this should be added (se) | 160 | invalidateCache(); // zecke: I think this should be added (se) |
160 | return m_backEnd->reload(); | 161 | return m_backEnd->reload(); |
161 | } | 162 | } |
162 | template <class T> | 163 | template <class T> |
163 | bool OPimAccessTemplate<T>::save() { | 164 | bool OPimAccessTemplate<T>::save() { |
164 | return m_backEnd->save(); | 165 | return m_backEnd->save(); |
165 | } | 166 | } |
166 | template <class T> | 167 | template <class T> |
167 | OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { | 168 | OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const { |
168 | QArray<int> ints = m_backEnd->allRecords(); | 169 | QArray<int> ints = m_backEnd->allRecords(); |
169 | List lis(ints, this ); | 170 | List lis(ints, this ); |
170 | return lis; | 171 | return lis; |
171 | } | 172 | } |
172 | template <class T> | 173 | template <class T> |
173 | OPimAccessTemplate<T>::List | 174 | OPimAccessTemplate<T>::List |
174 | OPimAccessTemplate<T>::queryByExample( const T& t, int sortOrder ) { | 175 | OPimAccessTemplate<T>::queryByExample( const T& t, int sortOrder ) { |
175 | QArray<int> ints = m_backEnd->queryByExample( t, sortOrder ); | 176 | QArray<int> ints = m_backEnd->queryByExample( t, sortOrder ); |
176 | 177 | ||
177 | List lis(ints, this ); | 178 | List lis(ints, this ); |
178 | return lis; | 179 | return lis; |
179 | } | 180 | } |
180 | template <class T> | 181 | template <class T> |
181 | T OPimAccessTemplate<T>::find( int uid ) const{ | 182 | T OPimAccessTemplate<T>::find( int uid ) const{ |
182 | T t = m_backEnd->find( uid ); | 183 | T t = m_backEnd->find( uid ); |
183 | cache( t ); | 184 | cache( t ); |
184 | return t; | 185 | return t; |
185 | } | 186 | } |
186 | template <class T> | 187 | template <class T> |
187 | T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, | 188 | T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, |
188 | uint current, CacheDirection dir )const { | 189 | uint current, CacheDirection dir )const { |
189 | /* | 190 | /* |
190 | * better do T.isEmpty() | 191 | * better do T.isEmpty() |
191 | * after a find this way we would | 192 | * after a find this way we would |
192 | * avoid two finds in QCache... | 193 | * avoid two finds in QCache... |
193 | */ | 194 | */ |
194 | // qWarning("find it now %d", uid ); | 195 | // qWarning("find it now %d", uid ); |
195 | if (m_cache.contains( uid ) ) { | 196 | if (m_cache.contains( uid ) ) { |
196 | return m_cache.find( uid ); | 197 | return m_cache.find( uid ); |
197 | } | 198 | } |
198 | 199 | ||
199 | T t = m_backEnd->find( uid, ar, current, dir ); | 200 | T t = m_backEnd->find( uid, ar, current, dir ); |
200 | cache( t ); | 201 | cache( t ); |
201 | return t; | 202 | return t; |
202 | } | 203 | } |
203 | template <class T> | 204 | template <class T> |
204 | void OPimAccessTemplate<T>::clear() { | 205 | void OPimAccessTemplate<T>::clear() { |
205 | invalidateCache(); | 206 | invalidateCache(); |
206 | m_backEnd->clear(); | 207 | m_backEnd->clear(); |
207 | } | 208 | } |
208 | template <class T> | 209 | template <class T> |
209 | bool OPimAccessTemplate<T>::add( const T& t ) { | 210 | bool OPimAccessTemplate<T>::add( const T& t ) { |
210 | cache( t ); | 211 | cache( t ); |
211 | return m_backEnd->add( t ); | 212 | return m_backEnd->add( t ); |
212 | } | 213 | } |
213 | template <class T> | 214 | template <class T> |
214 | bool OPimAccessTemplate<T>::remove( const T& t ) { | 215 | bool OPimAccessTemplate<T>::remove( const T& t ) { |
215 | return remove( t.uid() ); | 216 | return remove( t.uid() ); |
216 | } | 217 | } |
217 | template <class T> | 218 | template <class T> |
218 | bool OPimAccessTemplate<T>::remove( int uid ) { | 219 | bool OPimAccessTemplate<T>::remove( int uid ) { |
219 | m_cache.remove( uid ); | 220 | m_cache.remove( uid ); |
220 | return m_backEnd->remove( uid ); | 221 | return m_backEnd->remove( uid ); |
221 | } | 222 | } |
222 | template <class T> | 223 | template <class T> |
223 | bool OPimAccessTemplate<T>::replace( const T& t ) { | 224 | bool OPimAccessTemplate<T>::replace( const T& t ) { |
224 | m_cache.replace( t ); | 225 | m_cache.replace( t ); |
225 | return m_backEnd->replace( t ); | 226 | return m_backEnd->replace( t ); |
226 | } | 227 | } |
227 | template <class T> | 228 | template <class T> |
228 | void OPimAccessTemplate<T>::invalidateCache() { | 229 | void OPimAccessTemplate<T>::invalidateCache() { |
229 | m_cache.invalidate(); | 230 | m_cache.invalidate(); |
230 | } | 231 | } |
231 | template <class T> | 232 | template <class T> |
232 | OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() { | 233 | OPimAccessTemplate<T>::BackEnd* OPimAccessTemplate<T>::backEnd() { |
233 | return m_backEnd; | 234 | return m_backEnd; |
234 | } | 235 | } |
235 | template <class T> | 236 | template <class T> |
236 | bool OPimAccessTemplate<T>::wasChangedExternally()const { | 237 | bool OPimAccessTemplate<T>::wasChangedExternally()const { |
237 | return false; | 238 | return false; |
238 | } | 239 | } |
239 | template <class T> | 240 | template <class T> |
240 | void OPimAccessTemplate<T>::setBackEnd( BackEnd* end ) { | 241 | void OPimAccessTemplate<T>::setBackEnd( BackEnd* end ) { |
241 | m_backEnd = end; | 242 | m_backEnd = end; |
242 | if (m_backEnd ) | 243 | if (m_backEnd ) |
243 | m_backEnd->setFrontend( this ); | 244 | m_backEnd->setFrontend( this ); |
244 | } | 245 | } |
245 | template <class T> | 246 | template <class T> |
246 | void OPimAccessTemplate<T>::cache( const T& t ) const{ | 247 | void OPimAccessTemplate<T>::cache( const T& t ) const{ |
247 | /* hacky we need to work around the const*/ | 248 | /* hacky we need to work around the const*/ |
248 | ((OPimAccessTemplate<T>*)this)->m_cache.add( t ); | 249 | ((OPimAccessTemplate<T>*)this)->m_cache.add( t ); |
249 | } | 250 | } |
250 | template <class T> | 251 | template <class T> |
251 | void OPimAccessTemplate<T>::setSaneCacheSize( int size ) { | 252 | void OPimAccessTemplate<T>::setSaneCacheSize( int size ) { |
252 | m_cache.setSize( size ); | 253 | m_cache.setSize( size ); |
253 | } | 254 | } |
255 | template <class T> | ||
256 | void OPimAccessTemplate<T>::setReadAhead( uint count ) { | ||
257 | m_backEnd->setReadAhead( count ); | ||
258 | } | ||
254 | #endif | 259 | #endif |
diff --git a/libopie/pim/otodoaccesssql.cpp b/libopie/pim/otodoaccesssql.cpp index 9ef6b7c..8c2ea3a 100644 --- a/libopie/pim/otodoaccesssql.cpp +++ b/libopie/pim/otodoaccesssql.cpp | |||
@@ -33,508 +33,508 @@ namespace { | |||
33 | * LoadQuery | 33 | * LoadQuery |
34 | * this one queries for all uids | 34 | * this one queries for all uids |
35 | */ | 35 | */ |
36 | class LoadQuery : public OSQLQuery { | 36 | class LoadQuery : public OSQLQuery { |
37 | public: | 37 | public: |
38 | LoadQuery(); | 38 | LoadQuery(); |
39 | ~LoadQuery(); | 39 | ~LoadQuery(); |
40 | QString query()const; | 40 | QString query()const; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * inserts/adds a OTodo to the table | 44 | * inserts/adds a OTodo to the table |
45 | */ | 45 | */ |
46 | class InsertQuery : public OSQLQuery { | 46 | class InsertQuery : public OSQLQuery { |
47 | public: | 47 | public: |
48 | InsertQuery(const OTodo& ); | 48 | InsertQuery(const OTodo& ); |
49 | ~InsertQuery(); | 49 | ~InsertQuery(); |
50 | QString query()const; | 50 | QString query()const; |
51 | private: | 51 | private: |
52 | OTodo m_todo; | 52 | OTodo m_todo; |
53 | }; | 53 | }; |
54 | 54 | ||
55 | /** | 55 | /** |
56 | * removes one from the table | 56 | * removes one from the table |
57 | */ | 57 | */ |
58 | class RemoveQuery : public OSQLQuery { | 58 | class RemoveQuery : public OSQLQuery { |
59 | public: | 59 | public: |
60 | RemoveQuery(int uid ); | 60 | RemoveQuery(int uid ); |
61 | ~RemoveQuery(); | 61 | ~RemoveQuery(); |
62 | QString query()const; | 62 | QString query()const; |
63 | private: | 63 | private: |
64 | int m_uid; | 64 | int m_uid; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | /** | 67 | /** |
68 | * Clears (delete) a Table | 68 | * Clears (delete) a Table |
69 | */ | 69 | */ |
70 | class ClearQuery : public OSQLQuery { | 70 | class ClearQuery : public OSQLQuery { |
71 | public: | 71 | public: |
72 | ClearQuery(); | 72 | ClearQuery(); |
73 | ~ClearQuery(); | 73 | ~ClearQuery(); |
74 | QString query()const; | 74 | QString query()const; |
75 | 75 | ||
76 | }; | 76 | }; |
77 | 77 | ||
78 | /** | 78 | /** |
79 | * a find query | 79 | * a find query |
80 | */ | 80 | */ |
81 | class FindQuery : public OSQLQuery { | 81 | class FindQuery : public OSQLQuery { |
82 | public: | 82 | public: |
83 | FindQuery(int uid); | 83 | FindQuery(int uid); |
84 | FindQuery(const QArray<int>& ); | 84 | FindQuery(const QArray<int>& ); |
85 | ~FindQuery(); | 85 | ~FindQuery(); |
86 | QString query()const; | 86 | QString query()const; |
87 | private: | 87 | private: |
88 | QString single()const; | 88 | QString single()const; |
89 | QString multi()const; | 89 | QString multi()const; |
90 | QArray<int> m_uids; | 90 | QArray<int> m_uids; |
91 | int m_uid; | 91 | int m_uid; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | /** | 94 | /** |
95 | * overdue query | 95 | * overdue query |
96 | */ | 96 | */ |
97 | class OverDueQuery : public OSQLQuery { | 97 | class OverDueQuery : public OSQLQuery { |
98 | public: | 98 | public: |
99 | OverDueQuery(); | 99 | OverDueQuery(); |
100 | ~OverDueQuery(); | 100 | ~OverDueQuery(); |
101 | QString query()const; | 101 | QString query()const; |
102 | }; | 102 | }; |
103 | class EffQuery : public OSQLQuery { | 103 | class EffQuery : public OSQLQuery { |
104 | public: | 104 | public: |
105 | EffQuery( const QDate&, const QDate&, bool inc ); | 105 | EffQuery( const QDate&, const QDate&, bool inc ); |
106 | ~EffQuery(); | 106 | ~EffQuery(); |
107 | QString query()const; | 107 | QString query()const; |
108 | private: | 108 | private: |
109 | QString with()const; | 109 | QString with()const; |
110 | QString out()const; | 110 | QString out()const; |
111 | QDate m_start; | 111 | QDate m_start; |
112 | QDate m_end; | 112 | QDate m_end; |
113 | bool m_inc :1; | 113 | bool m_inc :1; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | 116 | ||
117 | CreateQuery::CreateQuery() : OSQLQuery() {} | 117 | CreateQuery::CreateQuery() : OSQLQuery() {} |
118 | CreateQuery::~CreateQuery() {} | 118 | CreateQuery::~CreateQuery() {} |
119 | QString CreateQuery::query()const { | 119 | QString CreateQuery::query()const { |
120 | QString qu; | 120 | QString qu; |
121 | qu += "create table todolist( uid, categories, completed, progress, "; | 121 | qu += "create table todolist( uid, categories, completed, progress, "; |
122 | qu += "summary, DueDate, priority, description )"; | 122 | qu += "summary, DueDate, priority, description )"; |
123 | return qu; | 123 | return qu; |
124 | } | 124 | } |
125 | 125 | ||
126 | LoadQuery::LoadQuery() : OSQLQuery() {} | 126 | LoadQuery::LoadQuery() : OSQLQuery() {} |
127 | LoadQuery::~LoadQuery() {} | 127 | LoadQuery::~LoadQuery() {} |
128 | QString LoadQuery::query()const { | 128 | QString LoadQuery::query()const { |
129 | QString qu; | 129 | QString qu; |
130 | qu += "select distinct uid from todolist"; | 130 | qu += "select distinct uid from todolist"; |
131 | 131 | ||
132 | return qu; | 132 | return qu; |
133 | } | 133 | } |
134 | 134 | ||
135 | InsertQuery::InsertQuery( const OTodo& todo ) | 135 | InsertQuery::InsertQuery( const OTodo& todo ) |
136 | : OSQLQuery(), m_todo( todo ) { | 136 | : OSQLQuery(), m_todo( todo ) { |
137 | } | 137 | } |
138 | InsertQuery::~InsertQuery() { | 138 | InsertQuery::~InsertQuery() { |
139 | } | 139 | } |
140 | /* | 140 | /* |
141 | * converts from a OTodo to a query | 141 | * converts from a OTodo to a query |
142 | * we leave out X-Ref + Alarms | 142 | * we leave out X-Ref + Alarms |
143 | */ | 143 | */ |
144 | QString InsertQuery::query()const{ | 144 | QString InsertQuery::query()const{ |
145 | 145 | ||
146 | int year, month, day; | 146 | int year, month, day; |
147 | year = month = day = 0; | 147 | year = month = day = 0; |
148 | if (m_todo.hasDueDate() ) { | 148 | if (m_todo.hasDueDate() ) { |
149 | QDate date = m_todo.dueDate(); | 149 | QDate date = m_todo.dueDate(); |
150 | year = date.year(); | 150 | year = date.year(); |
151 | month = date.month(); | 151 | month = date.month(); |
152 | day = date.day(); | 152 | day = date.day(); |
153 | } | 153 | } |
154 | QString qu; | 154 | QString qu; |
155 | qu = "insert into todolist VALUES(" + QString::number( m_todo.uid() ) + ",'" + m_todo.idsToString( m_todo.categories() ) + "',"; | 155 | qu = "insert into todolist VALUES(" + QString::number( m_todo.uid() ) + ",'" + m_todo.idsToString( m_todo.categories() ) + "',"; |
156 | qu += QString::number( m_todo.isCompleted() ) + "," + QString::number( m_todo.progress() ) + ","; | 156 | qu += QString::number( m_todo.isCompleted() ) + "," + QString::number( m_todo.progress() ) + ","; |
157 | qu += "'"+m_todo.summary()+"','"+QString::number(year)+"-"+QString::number(month)+"-"+QString::number(day)+"',"; | 157 | qu += "'"+m_todo.summary()+"','"+QString::number(year)+"-"+QString::number(month)+"-"+QString::number(day)+"',"; |
158 | qu += QString::number(m_todo.priority() ) +",'" + m_todo.description() + "')"; | 158 | qu += QString::number(m_todo.priority() ) +",'" + m_todo.description() + "')"; |
159 | 159 | ||
160 | qWarning("add %s", qu.latin1() ); | 160 | qWarning("add %s", qu.latin1() ); |
161 | return qu; | 161 | return qu; |
162 | } | 162 | } |
163 | 163 | ||
164 | RemoveQuery::RemoveQuery(int uid ) | 164 | RemoveQuery::RemoveQuery(int uid ) |
165 | : OSQLQuery(), m_uid( uid ) {} | 165 | : OSQLQuery(), m_uid( uid ) {} |
166 | RemoveQuery::~RemoveQuery() {} | 166 | RemoveQuery::~RemoveQuery() {} |
167 | QString RemoveQuery::query()const { | 167 | QString RemoveQuery::query()const { |
168 | QString qu = "DELETE from todolist where uid = " + QString::number(m_uid); | 168 | QString qu = "DELETE from todolist where uid = " + QString::number(m_uid); |
169 | return qu; | 169 | return qu; |
170 | } | 170 | } |
171 | 171 | ||
172 | 172 | ||
173 | ClearQuery::ClearQuery() | 173 | ClearQuery::ClearQuery() |
174 | : OSQLQuery() {} | 174 | : OSQLQuery() {} |
175 | ClearQuery::~ClearQuery() {} | 175 | ClearQuery::~ClearQuery() {} |
176 | QString ClearQuery::query()const { | 176 | QString ClearQuery::query()const { |
177 | QString qu = "drop table todolist"; | 177 | QString qu = "drop table todolist"; |
178 | return qu; | 178 | return qu; |
179 | } | 179 | } |
180 | FindQuery::FindQuery(int uid) | 180 | FindQuery::FindQuery(int uid) |
181 | : OSQLQuery(), m_uid(uid ) { | 181 | : OSQLQuery(), m_uid(uid ) { |
182 | } | 182 | } |
183 | FindQuery::FindQuery(const QArray<int>& ints) | 183 | FindQuery::FindQuery(const QArray<int>& ints) |
184 | : OSQLQuery(), m_uids(ints){ | 184 | : OSQLQuery(), m_uids(ints){ |
185 | } | 185 | } |
186 | FindQuery::~FindQuery() { | 186 | FindQuery::~FindQuery() { |
187 | } | 187 | } |
188 | QString FindQuery::query()const{ | 188 | QString FindQuery::query()const{ |
189 | if (m_uids.count() == 0 ) | 189 | if (m_uids.count() == 0 ) |
190 | return single(); | 190 | return single(); |
191 | else | 191 | else |
192 | return multi(); | 192 | return multi(); |
193 | } | 193 | } |
194 | QString FindQuery::single()const{ | 194 | QString FindQuery::single()const{ |
195 | QString qu = "select uid, categories, completed, progress, summary, "; | 195 | QString qu = "select uid, categories, completed, progress, summary, "; |
196 | qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid); | 196 | qu += "DueDate, priority, description from todolist where uid = " + QString::number(m_uid); |
197 | return qu; | 197 | return qu; |
198 | } | 198 | } |
199 | QString FindQuery::multi()const { | 199 | QString FindQuery::multi()const { |
200 | QString qu = "select uid, categories, completed, progress, summary, "; | 200 | QString qu = "select uid, categories, completed, progress, summary, "; |
201 | qu += "DueDate, priority, description from todolist where "; | 201 | qu += "DueDate, priority, description from todolist where "; |
202 | for (uint i = 0; i < m_uids.count(); i++ ) { | 202 | for (uint i = 0; i < m_uids.count(); i++ ) { |
203 | qu += " UID = " + QString::number( m_uids[i] ) + " OR"; | 203 | qu += " UID = " + QString::number( m_uids[i] ) + " OR"; |
204 | } | 204 | } |
205 | qu.remove( qu.length()-2, 2 ); | 205 | qu.remove( qu.length()-2, 2 ); |
206 | return qu; | 206 | return qu; |
207 | } | 207 | } |
208 | 208 | ||
209 | OverDueQuery::OverDueQuery(): OSQLQuery() {} | 209 | OverDueQuery::OverDueQuery(): OSQLQuery() {} |
210 | OverDueQuery::~OverDueQuery() {} | 210 | OverDueQuery::~OverDueQuery() {} |
211 | QString OverDueQuery::query()const { | 211 | QString OverDueQuery::query()const { |
212 | QDate date = QDate::currentDate(); | 212 | QDate date = QDate::currentDate(); |
213 | QString str; | 213 | QString str; |
214 | str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() ); | 214 | str = QString("select uid from todolist where DueDate ='%1-%2-%3'").arg(date.year() ).arg(date.month() ).arg(date.day() ); |
215 | 215 | ||
216 | return str; | 216 | return str; |
217 | } | 217 | } |
218 | 218 | ||
219 | 219 | ||
220 | EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc ) | 220 | EffQuery::EffQuery( const QDate& start, const QDate& end, bool inc ) |
221 | : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {} | 221 | : OSQLQuery(), m_start( start ), m_end( end ),m_inc(inc) {} |
222 | EffQuery::~EffQuery() {} | 222 | EffQuery::~EffQuery() {} |
223 | QString EffQuery::query()const { | 223 | QString EffQuery::query()const { |
224 | return m_inc ? with() : out(); | 224 | return m_inc ? with() : out(); |
225 | } | 225 | } |
226 | QString EffQuery::with()const { | 226 | QString EffQuery::with()const { |
227 | QString str; | 227 | QString str; |
228 | str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ") | 228 | str = QString("select uid from todolist where ( DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6' ) OR DueDate = '0-0-0' ") |
229 | .arg( m_start.year() ).arg( m_start.month() ).arg( m_start.day() ) | 229 | .arg( m_start.year() ).arg( m_start.month() ).arg( m_start.day() ) |
230 | .arg( m_end .year() ).arg( m_end .month() ).arg( m_end .day() ); | 230 | .arg( m_end .year() ).arg( m_end .month() ).arg( m_end .day() ); |
231 | return str; | 231 | return str; |
232 | } | 232 | } |
233 | QString EffQuery::out()const { | 233 | QString EffQuery::out()const { |
234 | QString str; | 234 | QString str; |
235 | str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6'") | 235 | str = QString("select uid from todolist where DueDate >= '%1-%2-%3' AND DueDate <= '%4-%5-%6'") |
236 | .arg(m_start.year() ).arg(m_start.month() ).arg( m_start.day() ) | 236 | .arg(m_start.year() ).arg(m_start.month() ).arg( m_start.day() ) |
237 | .arg(m_end. year() ).arg(m_end. month() ).arg(m_end.day() ); | 237 | .arg(m_end. year() ).arg(m_end. month() ).arg(m_end.day() ); |
238 | 238 | ||
239 | return str; | 239 | return str; |
240 | } | 240 | } |
241 | }; | 241 | }; |
242 | 242 | ||
243 | OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file ) | 243 | OTodoAccessBackendSQL::OTodoAccessBackendSQL( const QString& file ) |
244 | : OTodoAccessBackend(), m_dict(15), m_dirty(true) | 244 | : OTodoAccessBackend(), m_dict(15), m_dirty(true) |
245 | { | 245 | { |
246 | QString fi = file; | 246 | QString fi = file; |
247 | if ( fi.isEmpty() ) | 247 | if ( fi.isEmpty() ) |
248 | fi = Global::applicationFileName( "todolist", "todolist.db" ); | 248 | fi = Global::applicationFileName( "todolist", "todolist.db" ); |
249 | OSQLManager man; | 249 | OSQLManager man; |
250 | m_driver = man.standard(); | 250 | m_driver = man.standard(); |
251 | m_driver->setUrl(fi); | 251 | m_driver->setUrl(fi); |
252 | fillDict(); | 252 | fillDict(); |
253 | } | 253 | } |
254 | 254 | ||
255 | OTodoAccessBackendSQL::~OTodoAccessBackendSQL(){ | 255 | OTodoAccessBackendSQL::~OTodoAccessBackendSQL(){ |
256 | } | 256 | } |
257 | bool OTodoAccessBackendSQL::load(){ | 257 | bool OTodoAccessBackendSQL::load(){ |
258 | if (!m_driver->open() ) | 258 | if (!m_driver->open() ) |
259 | return false; | 259 | return false; |
260 | 260 | ||
261 | CreateQuery creat; | 261 | CreateQuery creat; |
262 | OSQLResult res = m_driver->query(&creat ); | 262 | OSQLResult res = m_driver->query(&creat ); |
263 | 263 | ||
264 | m_dirty = true; | 264 | m_dirty = true; |
265 | return true; | 265 | return true; |
266 | } | 266 | } |
267 | bool OTodoAccessBackendSQL::reload(){ | 267 | bool OTodoAccessBackendSQL::reload(){ |
268 | return load(); | 268 | return load(); |
269 | } | 269 | } |
270 | 270 | ||
271 | bool OTodoAccessBackendSQL::save(){ | 271 | bool OTodoAccessBackendSQL::save(){ |
272 | return m_driver->close(); | 272 | return m_driver->close(); |
273 | } | 273 | } |
274 | QArray<int> OTodoAccessBackendSQL::allRecords()const { | 274 | QArray<int> OTodoAccessBackendSQL::allRecords()const { |
275 | if (m_dirty ) | 275 | if (m_dirty ) |
276 | update(); | 276 | update(); |
277 | 277 | ||
278 | return m_uids; | 278 | return m_uids; |
279 | } | 279 | } |
280 | QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int ){ | 280 | QArray<int> OTodoAccessBackendSQL::queryByExample( const OTodo& , int ){ |
281 | QArray<int> ints(0); | 281 | QArray<int> ints(0); |
282 | return ints; | 282 | return ints; |
283 | } | 283 | } |
284 | OTodo OTodoAccessBackendSQL::find(int uid ) const{ | 284 | OTodo OTodoAccessBackendSQL::find(int uid ) const{ |
285 | FindQuery query( uid ); | 285 | FindQuery query( uid ); |
286 | return todo( m_driver->query(&query) ); | 286 | return todo( m_driver->query(&query) ); |
287 | 287 | ||
288 | } | 288 | } |
289 | #define CACHE 32 | ||
290 | OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints, | 289 | OTodo OTodoAccessBackendSQL::find( int uid, const QArray<int>& ints, |
291 | uint cur, Frontend::CacheDirection dir ) const{ | 290 | uint cur, Frontend::CacheDirection dir ) const{ |
291 | int CACHE = readAhead(); | ||
292 | qWarning("searching for %d", uid ); | 292 | qWarning("searching for %d", uid ); |
293 | QArray<int> search( CACHE ); | 293 | QArray<int> search( CACHE ); |
294 | uint size =0; | 294 | uint size =0; |
295 | OTodo to; | 295 | OTodo to; |
296 | 296 | ||
297 | // we try to cache CACHE items | 297 | // we try to cache CACHE items |
298 | switch( dir ) { | 298 | switch( dir ) { |
299 | /* forward */ | 299 | /* forward */ |
300 | case 0: | 300 | case 0: |
301 | for (uint i = cur; i < ints.count() && size < CACHE; i++ ) { | 301 | for (uint i = cur; i < ints.count() && size < CACHE; i++ ) { |
302 | qWarning("size %d %d", size, ints[i] ); | 302 | qWarning("size %d %d", size, ints[i] ); |
303 | search[size] = ints[i]; | 303 | search[size] = ints[i]; |
304 | size++; | 304 | size++; |
305 | } | 305 | } |
306 | break; | 306 | break; |
307 | /* reverse */ | 307 | /* reverse */ |
308 | case 1: | 308 | case 1: |
309 | for (uint i = cur; i != 0 && size < CACHE; i-- ) { | 309 | for (uint i = cur; i != 0 && size < CACHE; i-- ) { |
310 | search[size] = ints[i]; | 310 | search[size] = ints[i]; |
311 | size++; | 311 | size++; |
312 | } | 312 | } |
313 | break; | 313 | break; |
314 | } | 314 | } |
315 | search.resize( size ); | 315 | search.resize( size ); |
316 | FindQuery query( search ); | 316 | FindQuery query( search ); |
317 | OSQLResult res = m_driver->query( &query ); | 317 | OSQLResult res = m_driver->query( &query ); |
318 | if ( res.state() != OSQLResult::Success ) | 318 | if ( res.state() != OSQLResult::Success ) |
319 | return to; | 319 | return to; |
320 | 320 | ||
321 | return todo( res ); | 321 | return todo( res ); |
322 | } | 322 | } |
323 | void OTodoAccessBackendSQL::clear() { | 323 | void OTodoAccessBackendSQL::clear() { |
324 | ClearQuery cle; | 324 | ClearQuery cle; |
325 | OSQLResult res = m_driver->query( &cle ); | 325 | OSQLResult res = m_driver->query( &cle ); |
326 | CreateQuery qu; | 326 | CreateQuery qu; |
327 | res = m_driver->query(&qu); | 327 | res = m_driver->query(&qu); |
328 | } | 328 | } |
329 | bool OTodoAccessBackendSQL::add( const OTodo& t) { | 329 | bool OTodoAccessBackendSQL::add( const OTodo& t) { |
330 | InsertQuery ins( t ); | 330 | InsertQuery ins( t ); |
331 | OSQLResult res = m_driver->query( &ins ); | 331 | OSQLResult res = m_driver->query( &ins ); |
332 | 332 | ||
333 | if ( res.state() == OSQLResult::Failure ) | 333 | if ( res.state() == OSQLResult::Failure ) |
334 | return false; | 334 | return false; |
335 | int c = m_uids.count(); | 335 | int c = m_uids.count(); |
336 | m_uids.resize( c+1 ); | 336 | m_uids.resize( c+1 ); |
337 | m_uids[c] = t.uid(); | 337 | m_uids[c] = t.uid(); |
338 | 338 | ||
339 | return true; | 339 | return true; |
340 | } | 340 | } |
341 | bool OTodoAccessBackendSQL::remove( int uid ) { | 341 | bool OTodoAccessBackendSQL::remove( int uid ) { |
342 | RemoveQuery rem( uid ); | 342 | RemoveQuery rem( uid ); |
343 | OSQLResult res = m_driver->query(&rem ); | 343 | OSQLResult res = m_driver->query(&rem ); |
344 | 344 | ||
345 | if ( res.state() == OSQLResult::Failure ) | 345 | if ( res.state() == OSQLResult::Failure ) |
346 | return false; | 346 | return false; |
347 | 347 | ||
348 | m_dirty = true; | 348 | m_dirty = true; |
349 | return true; | 349 | return true; |
350 | } | 350 | } |
351 | /* | 351 | /* |
352 | * FIXME better set query | 352 | * FIXME better set query |
353 | * but we need the cache for that | 353 | * but we need the cache for that |
354 | * now we remove | 354 | * now we remove |
355 | */ | 355 | */ |
356 | bool OTodoAccessBackendSQL::replace( const OTodo& t) { | 356 | bool OTodoAccessBackendSQL::replace( const OTodo& t) { |
357 | remove( t.uid() ); | 357 | remove( t.uid() ); |
358 | bool b= add(t); | 358 | bool b= add(t); |
359 | m_dirty = false; // we changed some stuff but the UID stayed the same | 359 | m_dirty = false; // we changed some stuff but the UID stayed the same |
360 | return b; | 360 | return b; |
361 | } | 361 | } |
362 | QArray<int> OTodoAccessBackendSQL::overDue() { | 362 | QArray<int> OTodoAccessBackendSQL::overDue() { |
363 | OverDueQuery qu; | 363 | OverDueQuery qu; |
364 | return uids( m_driver->query(&qu ) ); | 364 | return uids( m_driver->query(&qu ) ); |
365 | } | 365 | } |
366 | QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s, | 366 | QArray<int> OTodoAccessBackendSQL::effectiveToDos( const QDate& s, |
367 | const QDate& t, | 367 | const QDate& t, |
368 | bool u) { | 368 | bool u) { |
369 | EffQuery ef(s, t, u ); | 369 | EffQuery ef(s, t, u ); |
370 | return uids (m_driver->query(&ef) ); | 370 | return uids (m_driver->query(&ef) ); |
371 | } | 371 | } |
372 | /* | 372 | /* |
373 | * | 373 | * |
374 | */ | 374 | */ |
375 | QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder, | 375 | QArray<int> OTodoAccessBackendSQL::sorted( bool asc, int sortOrder, |
376 | int sortFilter, int cat ) { | 376 | int sortFilter, int cat ) { |
377 | qWarning("sorted %d, %d", asc, sortOrder ); | 377 | qWarning("sorted %d, %d", asc, sortOrder ); |
378 | QString query; | 378 | QString query; |
379 | query = "select uid from todolist WHERE "; | 379 | query = "select uid from todolist WHERE "; |
380 | 380 | ||
381 | /* | 381 | /* |
382 | * Sort Filter stuff | 382 | * Sort Filter stuff |
383 | * not that straight forward | 383 | * not that straight forward |
384 | * | 384 | * |
385 | */ | 385 | */ |
386 | /* Category */ | 386 | /* Category */ |
387 | if ( sortFilter & 1 ) { | 387 | if ( sortFilter & 1 ) { |
388 | QString str; | 388 | QString str; |
389 | if (cat != 0 ) str = QString::number( cat ); | 389 | if (cat != 0 ) str = QString::number( cat ); |
390 | query += " categories like '%" +str+"%' AND"; | 390 | query += " categories like '%" +str+"%' AND"; |
391 | } | 391 | } |
392 | /* Show only overdue */ | 392 | /* Show only overdue */ |
393 | if ( sortFilter & 2 ) { | 393 | if ( sortFilter & 2 ) { |
394 | QDate date = QDate::currentDate(); | 394 | QDate date = QDate::currentDate(); |
395 | QString due; | 395 | QString due; |
396 | QString base; | 396 | QString base; |
397 | base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() ); | 397 | base = QString("DueDate <= '%1-%2-%3' AND completed = 0").arg( date.year() ).arg( date.month() ).arg( date.day() ); |
398 | query += " " + base + " AND"; | 398 | query += " " + base + " AND"; |
399 | } | 399 | } |
400 | /* not show completed */ | 400 | /* not show completed */ |
401 | if ( sortFilter & 4 ) { | 401 | if ( sortFilter & 4 ) { |
402 | query += " completed = 0 AND"; | 402 | query += " completed = 0 AND"; |
403 | }else{ | 403 | }else{ |
404 | query += " ( completed = 1 OR completed = 0) AND"; | 404 | query += " ( completed = 1 OR completed = 0) AND"; |
405 | } | 405 | } |
406 | /* srtip the end */ | 406 | /* srtip the end */ |
407 | query = query.remove( query.length()-3, 3 ); | 407 | query = query.remove( query.length()-3, 3 ); |
408 | 408 | ||
409 | 409 | ||
410 | /* | 410 | /* |
411 | * sort order stuff | 411 | * sort order stuff |
412 | * quite straight forward | 412 | * quite straight forward |
413 | */ | 413 | */ |
414 | query += "ORDER BY "; | 414 | query += "ORDER BY "; |
415 | switch( sortOrder ) { | 415 | switch( sortOrder ) { |
416 | /* completed */ | 416 | /* completed */ |
417 | case 0: | 417 | case 0: |
418 | query += "completed"; | 418 | query += "completed"; |
419 | break; | 419 | break; |
420 | case 1: | 420 | case 1: |
421 | query += "priority"; | 421 | query += "priority"; |
422 | break; | 422 | break; |
423 | case 2: | 423 | case 2: |
424 | query += "description"; | 424 | query += "description"; |
425 | break; | 425 | break; |
426 | case 3: | 426 | case 3: |
427 | query += "DueDate"; | 427 | query += "DueDate"; |
428 | break; | 428 | break; |
429 | } | 429 | } |
430 | 430 | ||
431 | if ( !asc ) { | 431 | if ( !asc ) { |
432 | qWarning("not ascending!"); | 432 | qWarning("not ascending!"); |
433 | query += " DESC"; | 433 | query += " DESC"; |
434 | } | 434 | } |
435 | 435 | ||
436 | qWarning( query ); | 436 | qWarning( query ); |
437 | OSQLRawQuery raw(query ); | 437 | OSQLRawQuery raw(query ); |
438 | return uids( m_driver->query(&raw) ); | 438 | return uids( m_driver->query(&raw) ); |
439 | } | 439 | } |
440 | bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ | 440 | bool OTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ |
441 | if ( str == "0-0-0" ) | 441 | if ( str == "0-0-0" ) |
442 | return false; | 442 | return false; |
443 | else{ | 443 | else{ |
444 | int day, year, month; | 444 | int day, year, month; |
445 | QStringList list = QStringList::split("-", str ); | 445 | QStringList list = QStringList::split("-", str ); |
446 | year = list[0].toInt(); | 446 | year = list[0].toInt(); |
447 | month = list[1].toInt(); | 447 | month = list[1].toInt(); |
448 | day = list[2].toInt(); | 448 | day = list[2].toInt(); |
449 | da.setYMD( year, month, day ); | 449 | da.setYMD( year, month, day ); |
450 | return true; | 450 | return true; |
451 | } | 451 | } |
452 | } | 452 | } |
453 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ | 453 | OTodo OTodoAccessBackendSQL::todo( const OSQLResult& res) const{ |
454 | if ( res.state() == OSQLResult::Failure ) { | 454 | if ( res.state() == OSQLResult::Failure ) { |
455 | OTodo to; | 455 | OTodo to; |
456 | return to; | 456 | return to; |
457 | } | 457 | } |
458 | 458 | ||
459 | OSQLResultItem::ValueList list = res.results(); | 459 | OSQLResultItem::ValueList list = res.results(); |
460 | OSQLResultItem::ValueList::Iterator it = list.begin(); | 460 | OSQLResultItem::ValueList::Iterator it = list.begin(); |
461 | qWarning("todo1"); | 461 | qWarning("todo1"); |
462 | OTodo to = todo( (*it) ); | 462 | OTodo to = todo( (*it) ); |
463 | cache( to ); | 463 | cache( to ); |
464 | ++it; | 464 | ++it; |
465 | 465 | ||
466 | for ( ; it != list.end(); ++it ) { | 466 | for ( ; it != list.end(); ++it ) { |
467 | qWarning("caching"); | 467 | qWarning("caching"); |
468 | cache( todo( (*it) ) ); | 468 | cache( todo( (*it) ) ); |
469 | } | 469 | } |
470 | return to; | 470 | return to; |
471 | } | 471 | } |
472 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { | 472 | OTodo OTodoAccessBackendSQL::todo( OSQLResultItem& item )const { |
473 | qWarning("todo"); | 473 | qWarning("todo"); |
474 | bool has = false; QDate da = QDate::currentDate(); | 474 | bool has = false; QDate da = QDate::currentDate(); |
475 | has = date( da, item.data("DueDate") ); | 475 | has = date( da, item.data("DueDate") ); |
476 | QStringList cats = QStringList::split(";", item.data("categories") ); | 476 | QStringList cats = QStringList::split(";", item.data("categories") ); |
477 | 477 | ||
478 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), | 478 | OTodo to( (bool)item.data("completed").toInt(), item.data("priority").toInt(), |
479 | cats, item.data("summary"), item.data("description"), | 479 | cats, item.data("summary"), item.data("description"), |
480 | item.data("progress").toUShort(), has, da, | 480 | item.data("progress").toUShort(), has, da, |
481 | item.data("uid").toInt() ); | 481 | item.data("uid").toInt() ); |
482 | return to; | 482 | return to; |
483 | } | 483 | } |
484 | OTodo OTodoAccessBackendSQL::todo( int uid )const { | 484 | OTodo OTodoAccessBackendSQL::todo( int uid )const { |
485 | FindQuery find( uid ); | 485 | FindQuery find( uid ); |
486 | return todo( m_driver->query(&find) ); | 486 | return todo( m_driver->query(&find) ); |
487 | } | 487 | } |
488 | /* | 488 | /* |
489 | * update the dict | 489 | * update the dict |
490 | */ | 490 | */ |
491 | void OTodoAccessBackendSQL::fillDict() { | 491 | void OTodoAccessBackendSQL::fillDict() { |
492 | /* initialize dict */ | 492 | /* initialize dict */ |
493 | /* | 493 | /* |
494 | * UPDATE dict if you change anything!!! | 494 | * UPDATE dict if you change anything!!! |
495 | */ | 495 | */ |
496 | m_dict.setAutoDelete( TRUE ); | 496 | m_dict.setAutoDelete( TRUE ); |
497 | m_dict.insert("Categories" , new int(OTodo::Category) ); | 497 | m_dict.insert("Categories" , new int(OTodo::Category) ); |
498 | m_dict.insert("Uid" , new int(OTodo::Uid) ); | 498 | m_dict.insert("Uid" , new int(OTodo::Uid) ); |
499 | m_dict.insert("HasDate" , new int(OTodo::HasDate) ); | 499 | m_dict.insert("HasDate" , new int(OTodo::HasDate) ); |
500 | m_dict.insert("Completed" , new int(OTodo::Completed) ); | 500 | m_dict.insert("Completed" , new int(OTodo::Completed) ); |
501 | m_dict.insert("Description" , new int(OTodo::Description) ); | 501 | m_dict.insert("Description" , new int(OTodo::Description) ); |
502 | m_dict.insert("Summary" , new int(OTodo::Summary) ); | 502 | m_dict.insert("Summary" , new int(OTodo::Summary) ); |
503 | m_dict.insert("Priority" , new int(OTodo::Priority) ); | 503 | m_dict.insert("Priority" , new int(OTodo::Priority) ); |
504 | m_dict.insert("DateDay" , new int(OTodo::DateDay) ); | 504 | m_dict.insert("DateDay" , new int(OTodo::DateDay) ); |
505 | m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); | 505 | m_dict.insert("DateMonth" , new int(OTodo::DateMonth) ); |
506 | m_dict.insert("DateYear" , new int(OTodo::DateYear) ); | 506 | m_dict.insert("DateYear" , new int(OTodo::DateYear) ); |
507 | m_dict.insert("Progress" , new int(OTodo::Progress) ); | 507 | m_dict.insert("Progress" , new int(OTodo::Progress) ); |
508 | m_dict.insert("Completed", new int(OTodo::Completed) ); | 508 | m_dict.insert("Completed", new int(OTodo::Completed) ); |
509 | m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); | 509 | m_dict.insert("CrossReference", new int(OTodo::CrossReference) ); |
510 | m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); | 510 | m_dict.insert("HasAlarmDateTime",new int(OTodo::HasAlarmDateTime) ); |
511 | m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); | 511 | m_dict.insert("AlarmDateTime", new int(OTodo::AlarmDateTime) ); |
512 | } | 512 | } |
513 | /* | 513 | /* |
514 | * need to be const so let's fool the | 514 | * need to be const so let's fool the |
515 | * compiler :( | 515 | * compiler :( |
516 | */ | 516 | */ |
517 | void OTodoAccessBackendSQL::update()const { | 517 | void OTodoAccessBackendSQL::update()const { |
518 | ((OTodoAccessBackendSQL*)this)->m_dirty = false; | 518 | ((OTodoAccessBackendSQL*)this)->m_dirty = false; |
519 | LoadQuery lo; | 519 | LoadQuery lo; |
520 | OSQLResult res = m_driver->query(&lo); | 520 | OSQLResult res = m_driver->query(&lo); |
521 | if ( res.state() != OSQLResult::Success ) | 521 | if ( res.state() != OSQLResult::Success ) |
522 | return; | 522 | return; |
523 | 523 | ||
524 | ((OTodoAccessBackendSQL*)this)->m_uids = uids( res ); | 524 | ((OTodoAccessBackendSQL*)this)->m_uids = uids( res ); |
525 | } | 525 | } |
526 | QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ | 526 | QArray<int> OTodoAccessBackendSQL::uids( const OSQLResult& res) const{ |
527 | 527 | ||
528 | OSQLResultItem::ValueList list = res.results(); | 528 | OSQLResultItem::ValueList list = res.results(); |
529 | OSQLResultItem::ValueList::Iterator it; | 529 | OSQLResultItem::ValueList::Iterator it; |
530 | QArray<int> ints(list.count() ); | 530 | QArray<int> ints(list.count() ); |
531 | qWarning(" count = %d", list.count() ); | 531 | qWarning(" count = %d", list.count() ); |
532 | 532 | ||
533 | int i = 0; | 533 | int i = 0; |
534 | for (it = list.begin(); it != list.end(); ++it ) { | 534 | for (it = list.begin(); it != list.end(); ++it ) { |
535 | ints[i] = (*it).data("uid").toInt(); | 535 | ints[i] = (*it).data("uid").toInt(); |
536 | i++; | 536 | i++; |
537 | } | 537 | } |
538 | return ints; | 538 | return ints; |
539 | } | 539 | } |
540 | 540 | ||