summaryrefslogtreecommitdiff
path: root/libopie2/opiedb
Side-by-side diff
Diffstat (limited to 'libopie2/opiedb') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp19
1 files changed, 12 insertions, 7 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index ccac2f8..588fc8f 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -90,3 +90,2 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
int res;
-
if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
@@ -111,3 +110,3 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
void rlikeFunc(sqlite_func *context, int arg, const char **argv){
- if( argv[0]==0 || argv[1]==0 || argv[2]==0){
+ if( argv[0]==0 || argv[1]==0 ){
printf("One of arguments Null!!\n");
@@ -117,3 +116,3 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){
sqliteRlikeCompare((const char*)argv[0],
- (const char*)argv[1], (sqregex*)argv[2]));
+ (const char*)argv[1], (sqregex *)sqlite_user_data(context) ));
}
@@ -126,3 +125,4 @@ bool OSQLiteDriver::open() {
char *error;
- qDebug("OSQLiteDriver::open: about to open");
+
+ qDebug("OSQLiteDriver::open: about to open");
m_sqlite = sqlite_open(m_url.local8Bit(),
@@ -138,3 +138,7 @@ bool OSQLiteDriver::open() {
}
- sqlite_create_function(m_sqlite,"rlike",3,rlikeFunc,&sqreg);
+ if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0)
+ odebug << "Unable to create user defined function!" << oendl;
+ if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0)
+ odebug << "Unable to set rlike function result type!" << oendl;
+ sqreg.regex_raw = NULL;
return true;
@@ -151,3 +155,4 @@ bool OSQLiteDriver::close() {
if (sqreg.regex_raw != NULL){
- free(sqreg.regex_raw);
+ odebug << "Freeing regex on close" << oendl;
+ free(sqreg.regex_raw);
sqreg.regex_raw=NULL;
@@ -171,3 +176,3 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) {
- qWarning("OSQLiteDriver::query: Error while executing");
+ qWarning("OSQLiteDriver::query: Error while executing %s",err);
free(err );