Diffstat (limited to 'libopie2/opiedb/osqlitedriver.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 3ba161e..ccac2f8 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -13,57 +13,57 @@ | |||
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; |
16 | : .. .:, . . . without even the implied warranty of | 16 | : .. .:, . . . without even the implied warranty of |
17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 17 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 18 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
19 | ..}^=.= = ; Library General Public License for more | 19 | ..}^=.= = ; Library General Public License for more |
20 | ++= -. .` .: details. | 20 | ++= -. .` .: details. |
21 | : = ...= . :.=- | 21 | : = ...= . :.=- |
22 | -. .:....=;==+<; You should have received a copy of the GNU | 22 | -. .:....=;==+<; You should have received a copy of the GNU |
23 | -_. . . )=. = Library General Public License along with | 23 | -_. . . )=. = Library General Public License along with |
24 | -- :-=` this library; see the file COPYING.LIB. | 24 | -- :-=` this library; see the file COPYING.LIB. |
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | 28 | ||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "osqlquery.h" | 31 | #include "osqlquery.h" |
32 | #include "osqlitedriver.h" | 32 | #include "osqlitedriver.h" |
33 | 33 | ||
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | #include <regex.h> | ||
38 | #include <stdio.h> | 37 | #include <stdio.h> |
39 | 38 | ||
40 | // fromLocal8Bit() does not work as expected. Thus it | 39 | // fromLocal8Bit() does not work as expected. Thus it |
41 | // is replaced by fromLatin1() (eilers) | 40 | // is replaced by fromLatin1() (eilers) |
42 | #define __BUGGY_LOCAL8BIT_ | 41 | #define __BUGGY_LOCAL8BIT_ |
43 | 42 | ||
44 | using namespace Opie::DB; | 43 | namespace Opie { |
45 | using namespace Opie::DB::Internal; | 44 | namespace DB { |
45 | namespace Internal { | ||
46 | 46 | ||
47 | namespace { | 47 | namespace { |
48 | struct Query { | 48 | struct Query { |
49 | OSQLError::ValueList errors; | 49 | OSQLError::ValueList errors; |
50 | OSQLResultItem::ValueList items; | 50 | OSQLResultItem::ValueList items; |
51 | OSQLiteDriver *driver; | 51 | OSQLiteDriver *driver; |
52 | }; | 52 | }; |
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) | 56 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) |
57 | : OSQLDriver( lib ) | 57 | : OSQLDriver( lib ) |
58 | { | 58 | { |
59 | m_sqlite = 0l; | 59 | m_sqlite = 0l; |
60 | } | 60 | } |
61 | 61 | ||
62 | 62 | ||
63 | OSQLiteDriver::~OSQLiteDriver() { | 63 | OSQLiteDriver::~OSQLiteDriver() { |
64 | close(); | 64 | close(); |
65 | } | 65 | } |
66 | 66 | ||
67 | 67 | ||
68 | QString OSQLiteDriver::id()const { | 68 | QString OSQLiteDriver::id()const { |
69 | return QString::fromLatin1("SQLite"); | 69 | return QString::fromLatin1("SQLite"); |
@@ -208,24 +208,26 @@ int OSQLiteDriver::call_back( void* voi, int argc, | |||
208 | //copy them over to a OSQLResultItem | 208 | //copy them over to a OSQLResultItem |
209 | QMap<QString, QString> tableString; | 209 | QMap<QString, QString> tableString; |
210 | QMap<int, QString> tableInt; | 210 | QMap<int, QString> tableInt; |
211 | for (int i = 0; i < argc; i++ ) { | 211 | for (int i = 0; i < argc; i++ ) { |
212 | 212 | ||
213 | #ifdef __BUGGY_LOCAL8BIT_ | 213 | #ifdef __BUGGY_LOCAL8BIT_ |
214 | tableInt.insert( i, QString::fromLatin1( argv[i] ) ); | 214 | tableInt.insert( i, QString::fromLatin1( argv[i] ) ); |
215 | tableString.insert( QString::fromLatin1( columns[i] ), | 215 | tableString.insert( QString::fromLatin1( columns[i] ), |
216 | QString::fromLatin1( argv[i] ) ); | 216 | QString::fromLatin1( argv[i] ) ); |
217 | #else | 217 | #else |
218 | tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) ); | 218 | tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) ); |
219 | tableString.insert( QString::fromLocal8Bit( columns[i] ), | 219 | tableString.insert( QString::fromLocal8Bit( columns[i] ), |
220 | QString::fromLocal8Bit( argv[i] ) ); | 220 | QString::fromLocal8Bit( argv[i] ) ); |
221 | #endif | 221 | #endif |
222 | } | 222 | } |
223 | OSQLResultItem item( tableString, tableInt ); | 223 | OSQLResultItem item( tableString, tableInt ); |
224 | qu->items.append( item ); | 224 | qu->items.append( item ); |
225 | 225 | ||
226 | return ((Query*)voi)->driver->handleCallBack( argc, | 226 | return ((Query*)voi)->driver->handleCallBack( argc, |
227 | argv, | 227 | argv, |
228 | columns ); | 228 | columns ); |
229 | 229 | ||
230 | 230 | ||
231 | } | 231 | } |
232 | |||
233 | }}} // namespace OPIE::DB::Internal | ||