Fixes for sqlite regex driver. Function must be implemented as

rlike("pattern","match") instead of "where uid rlike("99")" you must
use "where rlike("99",uid). My mistake. Also fixes for pointer math for
context regex caching.

2 files changed, 14 insertions, 9 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
@@ -87,9 +87,8 @@ 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(&reg->regex_c);
@@ -108,24 +107,25 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
 	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 );
 
@@ -135,9 +135,13 @@ bool OSQLiteDriver::open() {
         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;
 }
 
 
@@ -148,9 +152,10 @@ bool OSQLiteDriver::open() {
 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;
@@ -168,9 +173,9 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
     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
     }
 
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index bb5c99b..401a3c1 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -600,9 +600,9 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
 }
 
 QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
 {
-#if 1
+#if 0
 	QArray<int> nix(0);
 	return nix;
 
 #else
@@ -613,9 +613,9 @@ QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
 	// QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
 	for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
 		if ( !searchlist.isEmpty() )
 			searchlist += " OR ";
-		searchlist += "\"" + *it + "\" rlike(\"" + r.pattern() + "\") ";
+		searchlist += " rlike(\""+ r.pattern() + "\",\"" + *it + "\") ";
 	}
 		
 	qu = qu + searchlist + ")";