-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 19 |
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 @@ -85,13 +85,12 @@ void OSQLiteDriver::setOptions( const QStringList& ) { /* * Functions to patch a regex search into sqlite */ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ int res; - if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){ if (reg->regex_raw != NULL) { free(reg->regex_raw); regfree(®->regex_c); } reg->regex_raw = (char *)malloc(strlen(zPattern)+1); @@ -106,53 +105,59 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ } res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); return res; } 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"); return; } sqlite_set_result_int(context, sqliteRlikeCompare((const char*)argv[0], - (const char*)argv[1], (sqregex*)argv[2])); + (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); } /* * try to open a db specified via setUrl * and options */ bool OSQLiteDriver::open() { char *error; - qDebug("OSQLiteDriver::open: about to open"); + + qDebug("OSQLiteDriver::open: about to open"); m_sqlite = sqlite_open(m_url.local8Bit(), 0, &error ); /* failed to open */ if (m_sqlite == 0l ) { // FIXME set the last error qWarning("OSQLiteDriver::open: %s", error ); free( error ); return false; } - 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; } /* close the db * sqlite closes them without * telling failure or success */ bool OSQLiteDriver::close() { if (m_sqlite ) sqlite_close( m_sqlite ), m_sqlite=0l; if (sqreg.regex_raw != NULL){ - free(sqreg.regex_raw); + odebug << "Freeing regex on close" << oendl; + free(sqreg.regex_raw); sqreg.regex_raw=NULL; regfree(&sqreg.regex_c); } return true; } @@ -166,13 +171,13 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { } 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("OSQLiteDriver::query: Error while executing"); + qWarning("OSQLiteDriver::query: Error while executing %s",err); free(err ); // FixMe Errors } OSQLResult result(OSQLResult::Success, query.items, |