summaryrefslogtreecommitdiff
path: root/libopie2/opiedb
Unidiff
Diffstat (limited to 'libopie2/opiedb') (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiedb/opiedb.pro3
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp18
2 files changed, 16 insertions, 5 deletions
diff --git a/libopie2/opiedb/opiedb.pro b/libopie2/opiedb/opiedb.pro
index 3612f0e..bf547ab 100644
--- a/libopie2/opiedb/opiedb.pro
+++ b/libopie2/opiedb/opiedb.pro
@@ -1,4 +1,5 @@
1TEMPLATE = lib 1TEMPLATE = lib
2CONFIG += qt warn_on debug 2#CONFIG += qt warn_on debug
3CONFIG += qt warn_on release
3DESTDIR = $(OPIEDIR)/lib 4DESTDIR = $(OPIEDIR)/lib
4HEADERS = osqlbackend.h \ 5HEADERS = osqlbackend.h \
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 9214ad3..99fd218 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -5,4 +5,8 @@
5#include "osqlitedriver.h" 5#include "osqlitedriver.h"
6 6
7// fromLocal8Bit() does not work as expected. Thus it
8// is replaced by fromLatin1() (eilers)
9#define __BUGGY_LOCAL8BIT_
10
7 11
8namespace { 12namespace {
@@ -81,5 +85,5 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
81 // FixMe Errors 85 // FixMe Errors
82 } 86 }
83 qWarning("Item count is %d", query.items.count() ); 87 // qWarning("Item count is %d", query.items.count() );
84 OSQLResult result(OSQLResult::Success, 88 OSQLResult result(OSQLResult::Success,
85 query.items, 89 query.items,
@@ -103,5 +107,5 @@ int OSQLiteDriver::handleCallBack( int, char**, char** ) {
103int OSQLiteDriver::call_back( void* voi, int argc, 107int OSQLiteDriver::call_back( void* voi, int argc,
104 char** argv, char** columns) { 108 char** argv, char** columns) {
105 qWarning("Callback with %d items", argc ); 109 // qWarning("Callback with %d items", argc );
106 Query* qu = (Query*)voi; 110 Query* qu = (Query*)voi;
107 111
@@ -110,9 +114,15 @@ int OSQLiteDriver::call_back( void* voi, int argc,
110 QMap<int, QString> tableInt; 114 QMap<int, QString> tableInt;
111 for (int i = 0; i < argc; i++ ) { 115 for (int i = 0; i < argc; i++ ) {
112 qWarning("%s|%s", columns[i], argv[i] ); 116 //qWarning("%s|%s", columns[i], argv[i] );
117
118#ifdef __BUGGY_LOCAL8BIT_
119 tableInt.insert( i, QString::fromLatin1( argv[i] ) );
120 tableString.insert( QString::fromLatin1( columns[i] ),
121 QString::fromLatin1( argv[i] ) );
122#else
113 tableInt.insert( i, QString::fromLocal8Bit(argv[i] ) ); 123 tableInt.insert( i, QString::fromLocal8Bit(argv[i] ) );
114 tableString.insert( QString::fromLocal8Bit( columns[i]), 124 tableString.insert( QString::fromLocal8Bit( columns[i]),
115 QString::fromLocal8Bit( argv[i] ) ); 125 QString::fromLocal8Bit( argv[i] ) );
116 126#endif
117 } 127 }
118 OSQLResultItem item( tableString, tableInt ); 128 OSQLResultItem item( tableString, tableInt );