Diffstat (limited to 'libopie2/opiedb/osqlitedriver.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index c8b560f..816223e 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -103,14 +103,16 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ | |||
103 | return res; | 103 | return res; |
104 | } | 104 | } |
105 | 105 | ||
106 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | 106 | void rlikeFunc( sqlite3_context* context, int count, sqlite3_value** values ){ |
107 | if( arg < 2 || argv[0]==0 || argv[1]==0 ){ | 107 | const unsigned char* argv0 = sqlite3_value_text( values[0] ); |
108 | printf("One of arguments Null!!\n"); | 108 | const unsigned char* argv1 = sqlite3_value_text( values[1] ); |
109 | if( count < 2 || argv0 == 0 || argv1 == 0 ){ | ||
110 | qWarning( "One of arguments Null!!\n" ); | ||
109 | return; | 111 | return; |
110 | } | 112 | } |
111 | sqlite_set_result_int(context, | 113 | sqlite3_result_int(context, sqliteRlikeCompare((const char*)argv0, |
112 | sqliteRlikeCompare((const char*)argv[0], | 114 | (const char*)argv1, |
113 | (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); | 115 | (sqregex *) sqlite3_user_data( context ) )); |
114 | } | 116 | } |
115 | 117 | ||
116 | /* | 118 | /* |
@@ -118,25 +120,25 @@ void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | |||
118 | * and options | 120 | * and options |
119 | */ | 121 | */ |
120 | bool OSQLiteDriver::open() { | 122 | bool OSQLiteDriver::open() { |
121 | char *error; | ||
122 | |||
123 | odebug << "OSQLiteDriver::open: about to open" << oendl; | 123 | odebug << "OSQLiteDriver::open: about to open" << oendl; |
124 | m_sqlite = sqlite_open(m_url.local8Bit(), | 124 | |
125 | 0, | 125 | int error = sqlite3_open( m_url.utf8(), |
126 | &error ); | 126 | &m_sqlite ); |
127 | 127 | ||
128 | /* failed to open */ | 128 | /* failed to open */ |
129 | if (m_sqlite == 0l ) { | 129 | if ( error != SQLITE_OK ) { |
130 | // FIXME set the last error | 130 | // FIXME set the last error |
131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; | 131 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; |
132 | free( error ); | 132 | sqlite3_close( m_sqlite ); |
133 | return false; | 133 | return false; |
134 | } | 134 | } |
135 | if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) | 135 | if ( sqlite3_create_function( m_sqlite, "rlike", 2, SQLITE_UTF8, &sqreg, rlikeFunc, NULL, NULL ) != SQLITE_OK ){ |
136 | odebug << "Unable to create user defined function!" << oendl; | 136 | odebug << "Unable to create user defined function!" << oendl; |
137 | if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0) | 137 | return false; |
138 | odebug << "Unable to set rlike function result type!" << oendl; | 138 | } |
139 | |||
139 | sqreg.regex_raw = NULL; | 140 | sqreg.regex_raw = NULL; |
141 | |||
140 | return true; | 142 | return true; |
141 | } | 143 | } |
142 | 144 | ||
@@ -146,8 +148,10 @@ bool OSQLiteDriver::open() { | |||
146 | * telling failure or success | 148 | * telling failure or success |
147 | */ | 149 | */ |
148 | bool OSQLiteDriver::close() { | 150 | bool OSQLiteDriver::close() { |
149 | if (m_sqlite ) | 151 | if ( m_sqlite ){ |
150 | sqlite_close( m_sqlite ), m_sqlite=0l; | 152 | sqlite3_close( m_sqlite ); |
153 | m_sqlite=0l; | ||
154 | } | ||
151 | if (sqreg.regex_raw != NULL){ | 155 | if (sqreg.regex_raw != NULL){ |
152 | odebug << "Freeing regex on close" << oendl; | 156 | odebug << "Freeing regex on close" << oendl; |
153 | free(sqreg.regex_raw); | 157 | free(sqreg.regex_raw); |
@@ -169,7 +173,7 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | |||
169 | query.driver = this; | 173 | query.driver = this; |
170 | char *err; | 174 | char *err; |
171 | /* SQLITE_OK 0 if return code > 0 == failure */ | 175 | /* SQLITE_OK 0 if return code > 0 == failure */ |
172 | if ( sqlite_exec(m_sqlite, qu->query().utf8(),&call_back, &query, &err) > 0 ) { | 176 | if ( sqlite3_exec( m_sqlite, qu->query().utf8(), &call_back, &query, &err ) > SQLITE_OK ) { |
173 | owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; | 177 | owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; |
174 | free( err ); | 178 | free( err ); |
175 | // FixMe Errors | 179 | // FixMe Errors |