| -rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 44 | ||||
| -rw-r--r-- | libopie2/opiedb/osqlitedriver.h | 8 |
2 files changed, 32 insertions, 20 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 4eda9b9..f07d520 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp @@ -20,157 +20,161 @@ ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "osqlquery.h" #include "osqlitedriver.h" #include <opie2/odebug.h> #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; OSQLiteDriver *driver; }; } OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) : OSQLDriver( lib ) { m_sqlite = 0l; } OSQLiteDriver::~OSQLiteDriver() { close(); } QString OSQLiteDriver::id()const { return QString::fromLatin1("SQLite"); } void OSQLiteDriver::setUserName( const QString& ) {} 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){ +int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ int res; - if (regex_raw == NULL || (strcmp (zPattern, regex_raw) != 0)){ - if (regex_raw != NULL) { - free(regex_raw); - regfree(®ex_c); + + if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){ + if (reg->regex_raw != NULL) { + free(reg->regex_raw); + regfree(®->regex_c); } - regex_raw = (char *)malloc(strlen(zPattern)+1); - strncpy(regex_raw, zPattern, strlen(zPattern)+1); - res = regcomp(®ex_c, zPattern, REG_EXTENDED); + 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(regex_raw); - regex_raw=NULL; + free(reg->regex_raw); + reg->regex_raw=NULL; return 0; } } - res = (regexec(®ex_c, zString, 0, NULL, 0)==0); + 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 ) return; + if( argv[0]==0 || argv[1]==0 || argv[2]==0){ + printf("One of arguments Null!!\n"); + return; + } sqlite_set_result_int(context, sqliteRlikeCompare((const char*)argv[0], - (const char*)argv[1])); + (const char*)argv[1], (sqregex*)argv[2])); } /* * try to open a db specified via setUrl * and options */ bool OSQLiteDriver::open() { char *error; 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",2,rlikeFunc,NULL); + sqreg = (sqregex *)malloc(sizeof(sqreg)); + sqlite_create_function(m_sqlite,"rlike",3,rlikeFunc,&sqreg); 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; - free(regex_raw); - regex_raw=NULL; - regfree(®ex_c); + if (sqreg->regex_raw != NULL){ + free(sqreg->regex_raw); + sqreg->regex_raw=NULL; + regfree(&sqreg->regex_c); + } return true; } /* Query */ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { if ( !m_sqlite ) { // FIXME set error code 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("OSQLiteDriver::query: Error while executing"); free(err ); // FixMe Errors } OSQLResult result(OSQLResult::Success, query.items, query.errors ); diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h index 9064e52..95c9e2f 100644 --- a/libopie2/opiedb/osqlitedriver.h +++ b/libopie2/opiedb/osqlitedriver.h @@ -1,42 +1,50 @@ #ifndef OSQL_LITE_DRIVER_H #define OSQL_LITE_DRIVER_H #include <sqlite.h> +#include <regex.h> #include "osqldriver.h" #include "osqlerror.h" #include "osqlresult.h" namespace Opie { namespace DB { namespace Internal { +struct sqregex { + char *regex_raw; + regex_t regex_c; +}; + class OSQLiteDriver : public OSQLDriver { Q_OBJECT public: OSQLiteDriver( QLibrary *lib = 0l ); ~OSQLiteDriver(); QString id()const; void setUserName( const QString& ); void setPassword( const QString& ); void setUrl( const QString& url ); void setOptions( const QStringList& ); bool open(); bool close(); OSQLError lastError(); OSQLResult query( OSQLQuery* ); OSQLTable::ValueList tables()const; + private: OSQLError m_lastE; OSQLResult m_result; OSQLResultItem m_items; int handleCallBack( int, char**, char** ); static int call_back( void*, int, char**, char** ); QString m_url; sqlite *m_sqlite; + sqregex *sqreg; }; } } } #endif |