summaryrefslogtreecommitdiff
path: root/libopie2/opiedb
Unidiff
Diffstat (limited to 'libopie2/opiedb') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp19
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
@@ -88,7 +88,6 @@ void OSQLiteDriver::setOptions( const QStringList& ) {
88 */ 88 */
89int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ 89int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
90 int res; 90 int res;
91
92 if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){ 91 if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){
93 if (reg->regex_raw != NULL) { 92 if (reg->regex_raw != NULL) {
94 free(reg->regex_raw); 93 free(reg->regex_raw);
@@ -109,13 +108,13 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
109} 108}
110 109
111void rlikeFunc(sqlite_func *context, int arg, const char **argv){ 110void rlikeFunc(sqlite_func *context, int arg, const char **argv){
112 if( argv[0]==0 || argv[1]==0 || argv[2]==0){ 111 if( argv[0]==0 || argv[1]==0 ){
113 printf("One of arguments Null!!\n"); 112 printf("One of arguments Null!!\n");
114 return; 113 return;
115 } 114 }
116 sqlite_set_result_int(context, 115 sqlite_set_result_int(context,
117 sqliteRlikeCompare((const char*)argv[0], 116 sqliteRlikeCompare((const char*)argv[0],
118 (const char*)argv[1], (sqregex*)argv[2])); 117 (const char*)argv[1], (sqregex *)sqlite_user_data(context) ));
119} 118}
120 119
121/* 120/*
@@ -124,7 +123,8 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){
124 */ 123 */
125bool OSQLiteDriver::open() { 124bool OSQLiteDriver::open() {
126 char *error; 125 char *error;
127 qDebug("OSQLiteDriver::open: about to open"); 126
127 qDebug("OSQLiteDriver::open: about to open");
128 m_sqlite = sqlite_open(m_url.local8Bit(), 128 m_sqlite = sqlite_open(m_url.local8Bit(),
129 0, 129 0,
130 &error ); 130 &error );
@@ -136,7 +136,11 @@ bool OSQLiteDriver::open() {
136 free( error ); 136 free( error );
137 return false; 137 return false;
138 } 138 }
139 sqlite_create_function(m_sqlite,"rlike",3,rlikeFunc,&sqreg); 139 if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0)
140 odebug << "Unable to create user defined function!" << oendl;
141 if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0)
142 odebug << "Unable to set rlike function result type!" << oendl;
143 sqreg.regex_raw = NULL;
140 return true; 144 return true;
141} 145}
142 146
@@ -149,7 +153,8 @@ bool OSQLiteDriver::close() {
149 if (m_sqlite ) 153 if (m_sqlite )
150 sqlite_close( m_sqlite ), m_sqlite=0l; 154 sqlite_close( m_sqlite ), m_sqlite=0l;
151 if (sqreg.regex_raw != NULL){ 155 if (sqreg.regex_raw != NULL){
152 free(sqreg.regex_raw); 156 odebug << "Freeing regex on close" << oendl;
157 free(sqreg.regex_raw);
153 sqreg.regex_raw=NULL; 158 sqreg.regex_raw=NULL;
154 regfree(&sqreg.regex_c); 159 regfree(&sqreg.regex_c);
155 } 160 }
@@ -169,7 +174,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
169 char *err; 174 char *err;
170 /* SQLITE_OK 0 if return code > 0 == failure */ 175 /* SQLITE_OK 0 if return code > 0 == failure */
171 if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) { 176 if ( sqlite_exec(m_sqlite, qu->query(),&call_back, &query, &err) > 0 ) {
172 qWarning("OSQLiteDriver::query: Error while executing"); 177 qWarning("OSQLiteDriver::query: Error while executing %s",err);
173 free(err ); 178 free(err );
174 // FixMe Errors 179 // FixMe Errors
175 } 180 }