-rw-r--r-- | libopie2/opiedb/osqlbackendmanager.cpp | 12 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 78 |
2 files changed, 48 insertions, 42 deletions
diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp index fc18e07..bbfbf3d 100644 --- a/libopie2/opiedb/osqlbackendmanager.cpp +++ b/libopie2/opiedb/osqlbackendmanager.cpp @@ -1 +1,8 @@ + +#include "osqlbackendmanager.h" + +/* OPIE */ +#include <opie2/odebug.h> + +/* QT */ #include <qdir.h> @@ -3,3 +10,2 @@ -#include "osqlbackendmanager.h" @@ -40,3 +46,3 @@ namespace { line = (*it).stripWhiteSpace(); - qWarning("Anonymous::Config:" + line ); + owarn << "Anonymous::Config:" + line << oendl; QStringList test = QStringList::split(' ', line ); @@ -94,3 +100,3 @@ OSQLBackEnd OSQLBackEndManager::file2backend( const QString& file ) { OSQLBackEnd end; - qWarning("fileName: " + file ); + owarn << "fileName: " + file << oendl; Config cfg( file ); diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 588fc8f..69eddfe 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp @@ -42,4 +42,4 @@ -namespace Opie { -namespace DB { +namespace Opie { +namespace DB { namespace Internal { @@ -89,20 +89,20 @@ void OSQLiteDriver::setOptions( const QStringList& ) { 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); - strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1); - res = regcomp(®->regex_c, zPattern, REG_EXTENDED); - if ( res != 0 ) { - printf("Regcomp failed with code %u on string %s\n",res,zPattern); - free(reg->regex_raw); - reg->regex_raw=NULL; - return 0; - } - } - res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); - return res; + 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); + strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1); + res = regcomp(®->regex_c, zPattern, REG_EXTENDED); + if ( res != 0 ) { + printf("Regcomp failed with code %u on string %s\n",res,zPattern); + free(reg->regex_raw); + reg->regex_raw=NULL; + return 0; + } + } + res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); + return res; } @@ -110,9 +110,9 @@ 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 ){ - printf("One of arguments Null!!\n"); - return; - } - sqlite_set_result_int(context, - sqliteRlikeCompare((const char*)argv[0], - (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); + 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 *)sqlite_user_data(context) )); } @@ -125,4 +125,4 @@ bool OSQLiteDriver::open() { char *error; - - qDebug("OSQLiteDriver::open: about to open"); + + odebug << "OSQLiteDriver::open: about to open" << oendl; m_sqlite = sqlite_open(m_url.local8Bit(), @@ -134,3 +134,3 @@ bool OSQLiteDriver::open() { // FIXME set the last error - qWarning("OSQLiteDriver::open: %s", error ); + owarn << "OSQLiteDriver::open: " << error << "" << oendl; free( error ); @@ -139,5 +139,5 @@ bool OSQLiteDriver::open() { if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) - odebug << "Unable to create user defined function!" << oendl; + 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; + odebug << "Unable to set rlike function result type!" << oendl; sqreg.regex_raw = NULL; @@ -154,8 +154,8 @@ bool OSQLiteDriver::close() { sqlite_close( m_sqlite ), m_sqlite=0l; - if (sqreg.regex_raw != NULL){ - odebug << "Freeing regex on close" << oendl; - free(sqreg.regex_raw); - sqreg.regex_raw=NULL; - regfree(&sqreg.regex_c); - } + if (sqreg.regex_raw != NULL){ + odebug << "Freeing regex on close" << oendl; + free(sqreg.regex_raw); + sqreg.regex_raw=NULL; + regfree(&sqreg.regex_c); + } return true; @@ -176,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 %s",err); + owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; free(err ); |