| -rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index eea1093..4eda9b9 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp @@ -36,16 +36,18 @@ #include <stdlib.h> #include <regex.h> #include <stdio.h> // fromLocal8Bit() does not work as expected. Thus it // is replaced by fromLatin1() (eilers) #define __BUGGY_LOCAL8BIT_ + char *regex_raw; + regex_t regex_c; using namespace Opie::DB; using namespace Opie::DB::Internal; namespace { struct Query { OSQLError::ValueList errors; OSQLResultItem::ValueList items; @@ -79,34 +81,37 @@ void OSQLiteDriver::setPassword( const QString& ) {} void OSQLiteDriver::setUrl( const QString& url ) { m_url = url; } void OSQLiteDriver::setOptions( const QStringList& ) { } -/*------------------------------------------------------------------/* +/* * Functions to patch a regex search into sqlite - * -----------------------------------------------------------------*/ + */ int sqliteRlikeCompare(const char *zPattern, const char *zString){ - regex_t regex; int res; - if ( zPattern==NULL || zString==NULL ) { - printf("One of the args was null!\n"); - return 0; - } - res = regcomp(®ex, zPattern, REG_EXTENDED); - if ( res != 0 ) { - printf("Regcomp failed with code %u on string %s\n",res,zPattern); - + if (regex_raw == NULL || (strcmp (zPattern, regex_raw) != 0)){ + if (regex_raw != NULL) { + free(regex_raw); + regfree(®ex_c); + } + regex_raw = (char *)malloc(strlen(zPattern)+1); + strncpy(regex_raw, zPattern, strlen(zPattern)+1); + res = regcomp(®ex_c, zPattern, REG_EXTENDED); + if ( res != 0 ) { + printf("Regcomp failed with code %u on string %s\n",res,zPattern); + free(regex_raw); + regex_raw=NULL; return 0; + } } - res = (regexec(®ex, zString, 0, NULL, 0)==0); - regfree(®ex); + res = (regexec(®ex_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 ) return; sqlite_set_result_int(context, sqliteRlikeCompare((const char*)argv[0], (const char*)argv[1])); @@ -137,17 +142,19 @@ bool OSQLiteDriver::open() { /* close the db * sqlite closes them without * telling failure or success */ bool OSQLiteDriver::close() { if (m_sqlite ) sqlite_close( m_sqlite ), m_sqlite=0l; - + free(regex_raw); + regex_raw=NULL; + regfree(®ex_c); return true; } /* Query */ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { if ( !m_sqlite ) { // FIXME set error code |