summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/opiedb.pro3
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp22
2 files changed, 18 insertions, 7 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,14 +1,15 @@
TEMPLATE = lib
-CONFIG += qt warn_on debug
+#CONFIG += qt warn_on debug
+CONFIG += qt warn_on release
DESTDIR = $(OPIEDIR)/lib
HEADERS = osqlbackend.h \
osqldriver.h \
osqlerror.h \
osqlmanager.h \
osqlquery.h \
osqlresult.h \
osqltable.h \
osqlbackendmanager.h \
osqlitedriver.h
SOURCES = osqlbackend.cpp \
osqldriver.cpp \
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
@@ -1,18 +1,22 @@
#include <stdlib.h>
#include "osqlresult.h"
#include "osqlquery.h"
#include "osqlitedriver.h"
+// fromLocal8Bit() does not work as expected. Thus it
+// is replaced by fromLatin1() (eilers)
+#define __BUGGY_LOCAL8BIT_
+
namespace {
struct Query {
OSQLError::ValueList errors;
OSQLResultItem::ValueList items;
OSQLiteDriver *driver;
};
}
OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
: OSQLDriver( lib )
{
@@ -71,56 +75,62 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
OSQLResult result( OSQLResult::Failure );
return result;
}
Query query;
query.driver = this;
char *err;
/* SQLITE_OK 0 if return code > 0 == failure */
if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) {
qWarning("Error while executing");
free(err );
// FixMe Errors
}
- qWarning("Item count is %d", query.items.count() );
+ // qWarning("Item count is %d", query.items.count() );
OSQLResult result(OSQLResult::Success,
query.items,
query.errors );
return result;
}
OSQLTable::ValueList OSQLiteDriver::tables() const {
}
OSQLError OSQLiteDriver::lastError() {
OSQLError error;
return error;
};
/* handle a callback add the row to the global
* OSQLResultItem
*/
int OSQLiteDriver::handleCallBack( int, char**, char** ) {
return 0;
}
/* callback_handler add the values to the list*/
int OSQLiteDriver::call_back( void* voi, int argc,
char** argv, char** columns) {
- qWarning("Callback with %d items", argc );
+ // qWarning("Callback with %d items", argc );
Query* qu = (Query*)voi;
//copy them over to a OSQLResultItem
QMap<QString, QString> tableString;
QMap<int, QString> tableInt;
for (int i = 0; i < argc; i++ ) {
- qWarning("%s|%s", columns[i], argv[i] );
- tableInt.insert( i, QString::fromLocal8Bit(argv[i] ) );
- tableString.insert( QString::fromLocal8Bit( columns[i]),
- QString::fromLocal8Bit( argv[i] ) );
+ //qWarning("%s|%s", columns[i], argv[i] );
+#ifdef __BUGGY_LOCAL8BIT_
+ tableInt.insert( i, QString::fromLatin1( argv[i] ) );
+ tableString.insert( QString::fromLatin1( columns[i] ),
+ QString::fromLatin1( argv[i] ) );
+#else
+ tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) );
+ tableString.insert( QString::fromLocal8Bit( columns[i] ),
+ QString::fromLocal8Bit( argv[i] ) );
+#endif
}
OSQLResultItem item( tableString, tableInt );
qu->items.append( item );
return ((Query*)voi)->driver->handleCallBack( argc,
argv,
columns );
}