author | eilers <eilers> | 2004-10-27 14:28:16 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-10-27 14:28:16 (UTC) |
commit | 03adfc8b698fbed4b6f31c8320f510eb6da0d51d (patch) (unidiff) | |
tree | cb2faa9af5eedab6c816ca81433f457e8930cfc2 | |
parent | e44d35ca3fd26ef7a3184b07516f6535d8844a83 (diff) | |
download | opie-03adfc8b698fbed4b6f31c8320f510eb6da0d51d.zip opie-03adfc8b698fbed4b6f31c8320f510eb6da0d51d.tar.gz opie-03adfc8b698fbed4b6f31c8320f510eb6da0d51d.tar.bz2 |
Switching to sqlite3
Please read the following page for upgrade your old sqlite V2 database:
http://opie.handhelds.org/cgi-bin/moin.cgi/SqlBackends
-rw-r--r-- | Rules.make | 2 | ||||
-rw-r--r-- | dependencies.in | 2 | ||||
-rw-r--r-- | development/pim/dbpaper/intro.tex | 4 | ||||
-rw-r--r-- | libopie2/opiedb/config.in | 2 | ||||
-rw-r--r-- | libopie2/opiedb/libopiedb2.control | 4 | ||||
-rw-r--r-- | libopie2/opiedb/opiedb.pro | 2 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 98 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.h | 4 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimaccesstemplate.h | 7 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimcontactfields.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimtemplatebase.h | 6 |
11 files changed, 62 insertions, 71 deletions
@@ -300,18 +300,18 @@ $(TOPDIR)/scripts/filesubst : force | |||
300 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ | 300 | echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \ |
301 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ | 301 | echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \ |
302 | echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ | 302 | echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \ |
303 | ) > $@ || ( rm -f $@; exit 1 ) | 303 | ) > $@ || ( rm -f $@; exit 1 ) |
304 | 304 | ||
305 | ## general rules ## | 305 | ## general rules ## |
306 | 306 | ||
307 | define descend | 307 | define descend |
308 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) | 308 | $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2) |
309 | endef | 309 | endef |
310 | 310 | ||
311 | define makefilegen | 311 | define makefilegen |
312 | cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep -m 1 "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages)) | 312 | cd $(if $(1),$(dir $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(notdir $(1))) $(word 3,$(shell grep "[[:space:]]$(patsubst %/Makefile,%,$(1))[[:space:]]" $(OPIEDIR)/packages)) |
313 | endef | 313 | endef |
314 | 314 | ||
315 | define makecfg | 315 | define makecfg |
316 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) | 316 | $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR) |
317 | endef | 317 | endef |
diff --git a/dependencies.in b/dependencies.in index 55b44e6..ce1ac96 100644 --- a/dependencies.in +++ b/dependencies.in | |||
@@ -14,25 +14,25 @@ | |||
14 | boolean "Have libpcap >= 0.7.2" | 14 | boolean "Have libpcap >= 0.7.2" |
15 | default "n" | 15 | default "n" |
16 | 16 | ||
17 | config LIBPCAP_LIB_DIR | 17 | config LIBPCAP_LIB_DIR |
18 | string "LIBPCAP library dir" | 18 | string "LIBPCAP library dir" |
19 | depends LIBPCAP_DEP | 19 | depends LIBPCAP_DEP |
20 | 20 | ||
21 | config LIBPCAP_INC_DIR | 21 | config LIBPCAP_INC_DIR |
22 | string "LIBPCAP include dir" | 22 | string "LIBPCAP include dir" |
23 | depends LIBPCAP_DEP | 23 | depends LIBPCAP_DEP |
24 | 24 | ||
25 | config LIBSQLITE_DEP | 25 | config LIBSQLITE_DEP |
26 | boolean "Have sqlite >= 2.8.6" | 26 | boolean "Have sqlite >= 3.0.7" |
27 | default n | 27 | default n |
28 | 28 | ||
29 | config LIBSQLITE_LIB_DIR | 29 | config LIBSQLITE_LIB_DIR |
30 | string "LIBSQLITE library dir" | 30 | string "LIBSQLITE library dir" |
31 | depends LIBSQLITE_DEP | 31 | depends LIBSQLITE_DEP |
32 | 32 | ||
33 | config LIBSQLITE_INC_DIR | 33 | config LIBSQLITE_INC_DIR |
34 | string "LIBSQLITE include dir" | 34 | string "LIBSQLITE include dir" |
35 | depends LIBSQLITE_DEP | 35 | depends LIBSQLITE_DEP |
36 | 36 | ||
37 | config LIBXINE_DEP | 37 | config LIBXINE_DEP |
38 | boolean "Have libxine >= 1.0rc6" | 38 | boolean "Have libxine >= 1.0rc6" |
diff --git a/development/pim/dbpaper/intro.tex b/development/pim/dbpaper/intro.tex index c456333..fd790d7 100644 --- a/development/pim/dbpaper/intro.tex +++ b/development/pim/dbpaper/intro.tex | |||
@@ -3,35 +3,35 @@ | |||
3 | 3 | ||
4 | \subsection{This document} | 4 | \subsection{This document} |
5 | 5 | ||
6 | Note: This paper is just a request for comment! Don't expect to find anything in the real implementation ! | 6 | Note: This paper is just a request for comment! Don't expect to find anything in the real implementation ! |
7 | \\ | 7 | \\ |
8 | This draft paper describes the database layout of the Opie PIM applications. | 8 | This draft paper describes the database layout of the Opie PIM applications. |
9 | Design goal is a fast and extendable layout on a sql database to support cross referencing. | 9 | Design goal is a fast and extendable layout on a sql database to support cross referencing. |
10 | 10 | ||
11 | 11 | ||
12 | \subsection{Copyright} | 12 | \subsection{Copyright} |
13 | 13 | ||
14 | Copyright notice | 14 | Copyright notice |
15 | \copyright 2002, Maximilian Rei{\ss} \& Stefan Eilers \& Holger Freyther | 15 | \copyright 2002-2004, Maximilian Rei{\ss} \& Stefan Eilers \& Holger Freyther |
16 | 16 | ||
17 | \pagebreak | 17 | \pagebreak |
18 | \section{Relations} | 18 | \section{Relations} |
19 | \subsection{About Cross Referencing and Horizontal Data Storage} | 19 | \subsection{About Cross Referencing and Horizontal Data Storage} |
20 | Before you read on, it may be helpful to get some information about the solution of ``horizontal'' data storage into the tables and cross referencing. | 20 | Before you read on, it may be helpful to get some information about the solution of ``horizontal'' data storage into the tables and cross referencing. |
21 | Some of the tables are just using 5 attributes: | 21 | Some of the tables are just using 5 attributes: |
22 | \begin{enumerate} | 22 | \begin{enumerate} |
23 | \item UID: This countains an unique ID for the complete entry. An entry may consist of multiple | 23 | \item UID: This countains an unique ID for the complete entry. An entry may consist of multiple |
24 | rows, seperated by ID. | 24 | rows, seperated by ID. |
25 | \item ID: This defines a number to seperate the rows of an entry. UID + ID must be unique for every entry. | 25 | \item ID: This defines a number to seperate the rows of an entry. UID + ID must be unique for every entry (primary key). |
26 | \item Type: Describes the type of this entry. | 26 | \item Type: Describes the type of this entry. |
27 | \item Priority: For instance: Your default email-address will get the priority 1 and the other 2.. . 0 means ``not defined''. | 27 | \item Priority: For instance: Your default email-address will get the priority 1 and the other 2.. . 0 means ``not defined''. |
28 | \item Value: The data which was described by ``Type'' is stored here. | 28 | \item Value: The data which was described by ``Type'' is stored here. |
29 | \end{enumerate} | 29 | \end{enumerate} |
30 | 30 | ||
31 | These kinds of tables are very flexible in what they may contain, due to the fact that the ``Type'' may be without any constraint. Therefore it is perfectly for storing personal information, which may change in the future, or should be increased. | 31 | These kinds of tables are very flexible in what they may contain, due to the fact that the ``Type'' may be without any constraint. Therefore it is perfectly for storing personal information, which may change in the future, or should be increased. |
32 | \\ | 32 | \\ |
33 | Let's see how such an entry may look like for the table ``ADDRESSBOOK'': | 33 | Let's see how such an entry may look like for the table ``ADDRESSBOOK'': |
34 | 34 | ||
35 | \begin{tabular}[ht]{|l|l|l|l|} | 35 | \begin{tabular}[ht]{|l|l|l|l|} |
36 | \hline | 36 | \hline |
37 | \underline{UID} & \underline{ID} & Type & Value\\ | 37 | \underline{UID} & \underline{ID} & Type & Value\\ |
diff --git a/libopie2/opiedb/config.in b/libopie2/opiedb/config.in index 4d85609..0d74887 100644 --- a/libopie2/opiedb/config.in +++ b/libopie2/opiedb/config.in | |||
@@ -1,7 +1,7 @@ | |||
1 | config LIBOPIE2DB | 1 | config LIBOPIE2DB |
2 | boolean "libopie2db (database related classes)" | 2 | boolean "libopie2db (database related classes)" |
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP |
5 | comment "libopie2db needs a libqpe, sqlite and libopie2core" | 5 | comment "libopie2db needs a libqpe, libsqlite3 and libopie2core" |
6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP) | 6 | depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBSQLITE_DEP) |
7 | 7 | ||
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control index 4859c46..29fae78 100644 --- a/libopie2/opiedb/libopiedb2.control +++ b/libopie2/opiedb/libopiedb2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiedb2 | 1 | Package: libopiedb2 |
2 | Files: lib/libopiedb2.so* | 2 | Files: lib/libopiedb2.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 1.8.2-$SUB_VERSION.2 | 7 | Version: 1.8.2-$SUB_VERSION.2 |
8 | Depends: libqpe1, libopiecore2 (1.8.2), libsqlite0 | sqlite | 8 | Depends: libqpe1, libopiecore2 (1.8.2), libsqlite3 | sqlite3 |
9 | Provides: libopiedb2 | 9 | Provides: libopiedb2 |
10 | Description: Opie library 2.0 DB | 10 | Description: Opie library 2.1 DB |
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro index 8432674..f727995 100644 --- a/libopie2/opiedb/opiedb.pro +++ b/libopie2/opiedb/opiedb.pro | |||
@@ -16,25 +16,25 @@ SOURCES = osqlbackend.cpp \ | |||
16 | osqlerror.cpp \ | 16 | osqlerror.cpp \ |
17 | osqlmanager.cpp \ | 17 | osqlmanager.cpp \ |
18 | osqlquery.cpp \ | 18 | osqlquery.cpp \ |
19 | osqlresult.cpp \ | 19 | osqlresult.cpp \ |
20 | osqltable.cpp \ | 20 | osqltable.cpp \ |
21 | osqlbackendmanager.cpp \ | 21 | osqlbackendmanager.cpp \ |
22 | osqlitedriver.cpp | 22 | osqlitedriver.cpp |
23 | 23 | ||
24 | TARGET = opiedb2 | 24 | TARGET = opiedb2 |
25 | VERSION = 1.9.0 | 25 | VERSION = 1.9.0 |
26 | INCLUDEPATH = $(OPIEDIR)/include | 26 | INCLUDEPATH = $(OPIEDIR)/include |
27 | DEPENDPATH = $(OPIEDIR)/include | 27 | DEPENDPATH = $(OPIEDIR)/include |
28 | LIBS += -lopiecore2 -lqpe -lsqlite | 28 | LIBS += -lopiecore2 -lqpe -lsqlite3 |
29 | 29 | ||
30 | !contains( platform, x11 ) { | 30 | !contains( platform, x11 ) { |
31 | include ( $(OPIEDIR)/include.pro ) | 31 | include ( $(OPIEDIR)/include.pro ) |
32 | } | 32 | } |
33 | 33 | ||
34 | contains( platform, x11 ) { | 34 | contains( platform, x11 ) { |
35 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib | 35 | LIBS += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib |
36 | } | 36 | } |
37 | 37 | ||
38 | !isEmpty( LIBSQLITE_INC_DIR ) { | 38 | !isEmpty( LIBSQLITE_INC_DIR ) { |
39 | INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH | 39 | INCLUDEPATH = $$LIBSQLITE_INC_DIR $$INCLUDEPATH |
40 | } | 40 | } |
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index c8b560f..816223e 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -94,125 +94,129 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ | |||
94 | res = regcomp(®->regex_c, zPattern, REG_EXTENDED); | 94 | res = regcomp(®->regex_c, zPattern, REG_EXTENDED); |
95 | if ( res != 0 ) { | 95 | if ( res != 0 ) { |
96 | printf("Regcomp failed with code %u on string %s\n",res,zPattern); | 96 | printf("Regcomp failed with code %u on string %s\n",res,zPattern); |
97 | free(reg->regex_raw); | 97 | free(reg->regex_raw); |
98 | reg->regex_raw=NULL; | 98 | reg->regex_raw=NULL; |
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | } | 101 | } |
102 | res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); | 102 | res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); |
103 | return res; | 103 | return res; |
104 | } | 104 | } |
105 | 105 | ||
106 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | 106 | void rlikeFunc( sqlite3_context* context, int count, sqlite3_value** values ){ |
107 | if( arg < 2 || argv[0]==0 || argv[1]==0 ){ | 107 | const unsigned char* argv0 = sqlite3_value_text( values[0] ); |
108 | printf("One of arguments Null!!\n"); | 108 | const unsigned char* argv1 = sqlite3_value_text( values[1] ); |
109 | return; | 109 | if( count < 2 || argv0 == 0 || argv1 == 0 ){ |
110 | qWarning( "One of arguments Null!!\n" ); | ||
111 | return; | ||
110 | } | 112 | } |
111 | sqlite_set_result_int(context, | 113 | sqlite3_result_int(context, sqliteRlikeCompare((const char*)argv0, |
112 | sqliteRlikeCompare((const char*)argv[0], | 114 | (const char*)argv1, |
113 | (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); | 115 | (sqregex *) sqlite3_user_data( context ) )); |
114 | } | 116 | } |
115 | 117 | ||
116 | /* | 118 | /* |
117 | * try to open a db specified via setUrl | 119 | * try to open a db specified via setUrl |
118 | * and options | 120 | * and options |
119 | */ | 121 | */ |
120 | bool OSQLiteDriver::open() { | 122 | bool OSQLiteDriver::open() { |
121 | char *error; | ||
122 | |||
123 | odebug << "OSQLiteDriver::open: about to open" << oendl; | 123 | odebug << "OSQLiteDriver::open: about to open" << oendl; |
124 | m_sqlite = sqlite_open(m_url.local8Bit(), | 124 | |
125 | 0, | 125 | int error = sqlite3_open( m_url.utf8(), |
126 | &error ); | 126 | &m_sqlite ); |
127 | 127 | ||
128 | /* failed to open */ | 128 | /* failed to open */ |
129 | if (m_sqlite == 0l ) { | 129 | if ( error != SQLITE_OK ) { |
130 | // FIXME set the last error | 130 | // FIXME set the last error |
131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; | 131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; |
132 | free( error ); | 132 | sqlite3_close( m_sqlite ); |
133 | return false; | 133 | return false; |
134 | } | 134 | } |
135 | if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) | 135 | if ( sqlite3_create_function( m_sqlite, "rlike", 2, SQLITE_UTF8, &sqreg, rlikeFunc, NULL, NULL ) != SQLITE_OK ){ |
136 | odebug << "Unable to create user defined function!" << oendl; | 136 | odebug << "Unable to create user defined function!" << oendl; |
137 | if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0) | 137 | return false; |
138 | odebug << "Unable to set rlike function result type!" << oendl; | 138 | } |
139 | |||
139 | sqreg.regex_raw = NULL; | 140 | sqreg.regex_raw = NULL; |
141 | |||
140 | return true; | 142 | return true; |
141 | } | 143 | } |
142 | 144 | ||
143 | 145 | ||
144 | /* close the db | 146 | /* close the db |
145 | * sqlite closes them without | 147 | * sqlite closes them without |
146 | * telling failure or success | 148 | * telling failure or success |
147 | */ | 149 | */ |
148 | bool OSQLiteDriver::close() { | 150 | bool OSQLiteDriver::close() { |
149 | if (m_sqlite ) | 151 | if ( m_sqlite ){ |
150 | sqlite_close( m_sqlite ), m_sqlite=0l; | 152 | sqlite3_close( m_sqlite ); |
151 | if (sqreg.regex_raw != NULL){ | 153 | m_sqlite=0l; |
152 | odebug << "Freeing regex on close" << oendl; | 154 | } |
153 | free(sqreg.regex_raw); | 155 | if ( sqreg.regex_raw != NULL){ |
154 | sqreg.regex_raw=NULL; | 156 | odebug << "Freeing regex on close" << oendl; |
155 | regfree(&sqreg.regex_c); | 157 | free( sqreg.regex_raw ); |
156 | } | 158 | sqreg.regex_raw = NULL; |
157 | return true; | 159 | regfree( &sqreg.regex_c ); |
160 | } | ||
161 | return true; | ||
158 | } | 162 | } |
159 | 163 | ||
160 | 164 | ||
161 | /* Query */ | 165 | /* Query */ |
162 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | 166 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { |
163 | if ( !m_sqlite ) { | 167 | if ( !m_sqlite ) { |
164 | // FIXME set error code | 168 | // FIXME set error code |
165 | OSQLResult result( OSQLResult::Failure ); | 169 | OSQLResult result( OSQLResult::Failure ); |
166 | return result; | 170 | return result; |
167 | } | 171 | } |
168 | Query query; | 172 | Query query; |
169 | query.driver = this; | 173 | query.driver = this; |
170 | char *err; | 174 | char *err; |
171 | /* SQLITE_OK 0 if return code > 0 == failure */ | 175 | /* SQLITE_OK 0 if return code > 0 == failure */ |
172 | if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) { | 176 | if ( sqlite3_exec( m_sqlite, qu->query().utf8(), &call_back, &query, &err ) > SQLITE_OK ) { |
173 | owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; | 177 | owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; |
174 | free( err ); | 178 | free( err ); |
175 | // FixMe Errors | 179 | // FixMe Errors |
176 | } | 180 | } |
177 | 181 | ||
178 | OSQLResult result(OSQLResult::Success, | 182 | OSQLResult result(OSQLResult::Success, |
179 | query.items, | 183 | query.items, |
180 | query.errors ); | 184 | query.errors ); |
181 | return result; | 185 | return result; |
182 | } | 186 | } |
183 | 187 | ||
184 | 188 | ||
185 | OSQLTable::ValueList OSQLiteDriver::tables() const { | 189 | OSQLTable::ValueList OSQLiteDriver::tables() const { |
186 | return OSQLTable::ValueList(); | 190 | return OSQLTable::ValueList(); |
187 | } | 191 | } |
188 | 192 | ||
189 | 193 | ||
190 | OSQLError OSQLiteDriver::lastError() { | 194 | OSQLError OSQLiteDriver::lastError() { |
191 | OSQLError error; | 195 | OSQLError error; |
192 | return error; | 196 | return error; |
193 | }; | 197 | }; |
194 | 198 | ||
195 | 199 | ||
196 | /* handle a callback add the row to the global | 200 | /* handle a callback add the row to the global |
197 | * OSQLResultItem | 201 | * OSQLResultItem |
198 | */ | 202 | */ |
199 | int OSQLiteDriver::handleCallBack( int, char**, char** ) { | 203 | int OSQLiteDriver::handleCallBack( int, char**, char** ) { |
200 | return 0; | 204 | return 0; |
201 | } | 205 | } |
202 | 206 | ||
203 | 207 | ||
204 | /* callback_handler add the values to the list*/ | 208 | /* callback_handler add the values to the list*/ |
205 | int OSQLiteDriver::call_back( void* voi, int argc, | 209 | int OSQLiteDriver::call_back( void* voi, int argc, |
206 | char** argv, char** columns) { | 210 | char** argv, char** columns ) { |
207 | Query* qu = (Query*)voi; | 211 | Query* qu = (Query*)voi; |
208 | 212 | ||
209 | //copy them over to a OSQLResultItem | 213 | //copy them over to a OSQLResultItem |
210 | QMap<QString, QString> tableString; | 214 | QMap<QString, QString> tableString; |
211 | QMap<int, QString> tableInt; | 215 | QMap<int, QString> tableInt; |
212 | for (int i = 0; i < argc; i++ ) { | 216 | for (int i = 0; i < argc; i++ ) { |
213 | 217 | ||
214 | tableInt.insert( i, QString::fromUtf8( argv[i] ) ); | 218 | tableInt.insert( i, QString::fromUtf8( argv[i] ) ); |
215 | tableString.insert( QString::fromUtf8( columns[i] ), | 219 | tableString.insert( QString::fromUtf8( columns[i] ), |
216 | QString::fromUtf8( argv[i] ) ); | 220 | QString::fromUtf8( argv[i] ) ); |
217 | } | 221 | } |
218 | OSQLResultItem item( tableString, tableInt ); | 222 | OSQLResultItem item( tableString, tableInt ); |
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h index e38fd52..4990a11 100644 --- a/libopie2/opiedb/osqlitedriver.h +++ b/libopie2/opiedb/osqlitedriver.h | |||
@@ -1,16 +1,16 @@ | |||
1 | #ifndef OSQL_LITE_DRIVER_H | 1 | #ifndef OSQL_LITE_DRIVER_H |
2 | #define OSQL_LITE_DRIVER_H | 2 | #define OSQL_LITE_DRIVER_H |
3 | 3 | ||
4 | #include <sqlite.h> | 4 | #include <sqlite3.h> |
5 | #include <sys/types.h> | 5 | #include <sys/types.h> |
6 | #include <regex.h> | 6 | #include <regex.h> |
7 | 7 | ||
8 | #include "osqldriver.h" | 8 | #include "osqldriver.h" |
9 | #include "osqlerror.h" | 9 | #include "osqlerror.h" |
10 | #include "osqlresult.h" | 10 | #include "osqlresult.h" |
11 | 11 | ||
12 | namespace Opie { | 12 | namespace Opie { |
13 | namespace DB { | 13 | namespace DB { |
14 | namespace Internal { | 14 | namespace Internal { |
15 | 15 | ||
16 | struct sqregex { | 16 | struct sqregex { |
@@ -32,20 +32,20 @@ public: | |||
32 | bool close(); | 32 | bool close(); |
33 | OSQLError lastError(); | 33 | OSQLError lastError(); |
34 | OSQLResult query( OSQLQuery* ); | 34 | OSQLResult query( OSQLQuery* ); |
35 | OSQLTable::ValueList tables()const; | 35 | OSQLTable::ValueList tables()const; |
36 | 36 | ||
37 | private: | 37 | private: |
38 | OSQLError m_lastE; | 38 | OSQLError m_lastE; |
39 | OSQLResult m_result; | 39 | OSQLResult m_result; |
40 | OSQLResultItem m_items; | 40 | OSQLResultItem m_items; |
41 | int handleCallBack( int, char**, char** ); | 41 | int handleCallBack( int, char**, char** ); |
42 | static int call_back( void*, int, char**, char** ); | 42 | static int call_back( void*, int, char**, char** ); |
43 | QString m_url; | 43 | QString m_url; |
44 | sqlite *m_sqlite; | 44 | sqlite3 *m_sqlite; |
45 | sqregex sqreg; | 45 | sqregex sqreg; |
46 | }; | 46 | }; |
47 | } | 47 | } |
48 | } | 48 | } |
49 | } | 49 | } |
50 | 50 | ||
51 | #endif | 51 | #endif |
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h index 7ab1ea5..f936d4e 100644 --- a/libopie2/opiepim/core/opimaccesstemplate.h +++ b/libopie2/opiepim/core/opimaccesstemplate.h | |||
@@ -169,25 +169,24 @@ public: | |||
169 | 169 | ||
170 | /** | 170 | /** |
171 | * replace T from backend | 171 | * replace T from backend |
172 | * @param t The item to replace | 172 | * @param t The item to replace |
173 | * @return <i>true</i> if successful. | 173 | * @return <i>true</i> if successful. |
174 | */ | 174 | */ |
175 | virtual bool replace( const T& t) ; | 175 | virtual bool replace( const T& t) ; |
176 | 176 | ||
177 | void setReadAhead( uint count ); | 177 | void setReadAhead( uint count ); |
178 | /** | 178 | /** |
179 | * @internal | 179 | * @internal |
180 | */ | 180 | */ |
181 | virtual T cacheFind( int uid )const; | ||
182 | void cache( const T& )const; | 181 | void cache( const T& )const; |
183 | void setSaneCacheSize( int ); | 182 | void setSaneCacheSize( int ); |
184 | 183 | ||
185 | QArray<int> records()const; | 184 | QArray<int> records()const; |
186 | protected: | 185 | protected: |
187 | /** | 186 | /** |
188 | * invalidate the cache | 187 | * invalidate the cache |
189 | */ | 188 | */ |
190 | void invalidateCache(); | 189 | void invalidateCache(); |
191 | 190 | ||
192 | void setBackEnd( BackEnd* end ); | 191 | void setBackEnd( BackEnd* end ); |
193 | /** | 192 | /** |
@@ -257,30 +256,24 @@ template <class T> | |||
257 | T OPimAccessTemplate<T>::find( int uid ) const{ | 256 | T OPimAccessTemplate<T>::find( int uid ) const{ |
258 | // First search in cache.. | 257 | // First search in cache.. |
259 | if ( m_cache.contains( uid ) ) | 258 | if ( m_cache.contains( uid ) ) |
260 | return m_cache.find( uid ); | 259 | return m_cache.find( uid ); |
261 | 260 | ||
262 | T t = m_backEnd->find( uid ); | 261 | T t = m_backEnd->find( uid ); |
263 | cache( t ); | 262 | cache( t ); |
264 | 263 | ||
265 | return t; | 264 | return t; |
266 | } | 265 | } |
267 | 266 | ||
268 | template <class T> | 267 | template <class T> |
269 | T OPimAccessTemplate<T>::cacheFind( int uid ) const | ||
270 | { | ||
271 | return m_cache.find( uid ); | ||
272 | } | ||
273 | |||
274 | template <class T> | ||
275 | T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, | 268 | T OPimAccessTemplate<T>::find( int uid, const QArray<int>& ar, |
276 | uint current, typename OTemplateBase<T>::CacheDirection dir )const { | 269 | uint current, typename OTemplateBase<T>::CacheDirection dir )const { |
277 | /* | 270 | /* |
278 | * better do T.isEmpty() | 271 | * better do T.isEmpty() |
279 | * after a find this way we would | 272 | * after a find this way we would |
280 | * avoid two finds in QCache... | 273 | * avoid two finds in QCache... |
281 | */ | 274 | */ |
282 | // owarn << "find it now " << uid << oendl; | 275 | // owarn << "find it now " << uid << oendl; |
283 | if ( m_cache.contains( uid ) ) { | 276 | if ( m_cache.contains( uid ) ) { |
284 | return m_cache.find( uid ); | 277 | return m_cache.find( uid ); |
285 | } | 278 | } |
286 | 279 | ||
diff --git a/libopie2/opiepim/core/opimcontactfields.h b/libopie2/opiepim/core/opimcontactfields.h index 3aa3894..2e42951 100644 --- a/libopie2/opiepim/core/opimcontactfields.h +++ b/libopie2/opiepim/core/opimcontactfields.h | |||
@@ -1,15 +1,15 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) The Main Author <main-author@whereever.org> | 3 | Copyright (C) Stefan Eielrs <eilers.stefan@epost.de> |
4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> | 4 | =. Copyright (C) The Opie Team <opie-devel@handhelds.org> |
5 | .=l. | 5 | .=l. |
6 | .>+-= | 6 | .>+-= |
7 | _;:, .> :=|. This program is free software; you can | 7 | _;:, .> :=|. This program is free software; you can |
8 | .> <`_, > . <= redistribute it and/or modify it under | 8 | .> <`_, > . <= redistribute it and/or modify it under |
9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 9 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
10 | .="- .-=="i, .._ License as published by the Free Software | 10 | .="- .-=="i, .._ License as published by the Free Software |
11 | - . .-<_> .<> Foundation; either version 2 of the License, | 11 | - . .-<_> .<> Foundation; either version 2 of the License, |
12 | ._= =} : or (at your option) any later version. | 12 | ._= =} : or (at your option) any later version. |
13 | .%`+i> _;_. | 13 | .%`+i> _;_. |
14 | .i_,=:_. -<s. This program is distributed in the hope that | 14 | .i_,=:_. -<s. This program is distributed in the hope that |
15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 15 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
diff --git a/libopie2/opiepim/core/opimtemplatebase.h b/libopie2/opiepim/core/opimtemplatebase.h index ec9a94e..787486c 100644 --- a/libopie2/opiepim/core/opimtemplatebase.h +++ b/libopie2/opiepim/core/opimtemplatebase.h | |||
@@ -84,30 +84,24 @@ public: | |||
84 | }; | 84 | }; |
85 | virtual ~OTemplateBase() { | 85 | virtual ~OTemplateBase() { |
86 | } | 86 | } |
87 | virtual T find( int uid )const = 0; | 87 | virtual T find( int uid )const = 0; |
88 | 88 | ||
89 | /** | 89 | /** |
90 | * read ahead find | 90 | * read ahead find |
91 | */ | 91 | */ |
92 | virtual T find( int uid, const QArray<int>& items, | 92 | virtual T find( int uid, const QArray<int>& items, |
93 | uint current, CacheDirection dir = Forward )const = 0; | 93 | uint current, CacheDirection dir = Forward )const = 0; |
94 | 94 | ||
95 | /** | 95 | /** |
96 | * Find in Cache.. | ||
97 | * Returns empty object if nothing found. | ||
98 | */ | ||
99 | virtual T cacheFind( int uid )const = 0; | ||
100 | |||
101 | /** | ||
102 | * Put element into Cache | 96 | * Put element into Cache |
103 | */ | 97 | */ |
104 | virtual void cache( const T& )const = 0; | 98 | virtual void cache( const T& )const = 0; |
105 | virtual void setSaneCacheSize( int ) = 0; | 99 | virtual void setSaneCacheSize( int ) = 0; |
106 | 100 | ||
107 | OPimRecord* record()const; | 101 | OPimRecord* record()const; |
108 | OPimRecord* record(int uid )const; | 102 | OPimRecord* record(int uid )const; |
109 | static T* rec(); | 103 | static T* rec(); |
110 | 104 | ||
111 | 105 | ||
112 | private: | 106 | private: |
113 | OTemplateBasePrivate *d; | 107 | OTemplateBasePrivate *d; |