author | brad <brad> | 2004-04-05 10:58:32 (UTC) |
---|---|---|
committer | brad <brad> | 2004-04-05 10:58:32 (UTC) |
commit | 0b481957a2eebf28b05d9803780d05ad4232aa00 (patch) (unidiff) | |
tree | 85b6b3123f8bbb86a79806ab07d9189c041730ce /libopie2 | |
parent | 900fb3d498891d9aca81c362b2ea3460d1dc3f59 (diff) | |
download | opie-0b481957a2eebf28b05d9803780d05ad4232aa00.zip opie-0b481957a2eebf28b05d9803780d05ad4232aa00.tar.gz opie-0b481957a2eebf28b05d9803780d05ad4232aa00.tar.bz2 |
Regex support for sqlite (finally)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 2c53248..eea1093 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -25,24 +25,26 @@ | |||
25 | If not, write to the Free Software Foundation, | 25 | If not, write to the Free Software Foundation, |
26 | Inc., 59 Temple Place - Suite 330, | 26 | Inc., 59 Temple Place - Suite 330, |
27 | Boston, MA 02111-1307, USA. | 27 | Boston, MA 02111-1307, USA. |
28 | 28 | ||
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "osqlquery.h" | 31 | #include "osqlquery.h" |
32 | #include "osqlitedriver.h" | 32 | #include "osqlitedriver.h" |
33 | 33 | ||
34 | #include <opie2/odebug.h> | 34 | #include <opie2/odebug.h> |
35 | 35 | ||
36 | #include <stdlib.h> | 36 | #include <stdlib.h> |
37 | #include <regex.h> | ||
38 | #include <stdio.h> | ||
37 | 39 | ||
38 | // fromLocal8Bit() does not work as expected. Thus it | 40 | // fromLocal8Bit() does not work as expected. Thus it |
39 | // is replaced by fromLatin1() (eilers) | 41 | // is replaced by fromLatin1() (eilers) |
40 | #define __BUGGY_LOCAL8BIT_ | 42 | #define __BUGGY_LOCAL8BIT_ |
41 | 43 | ||
42 | 44 | ||
43 | using namespace Opie::DB; | 45 | using namespace Opie::DB; |
44 | using namespace Opie::DB::Internal; | 46 | using namespace Opie::DB::Internal; |
45 | 47 | ||
46 | namespace { | 48 | namespace { |
47 | struct Query { | 49 | struct Query { |
48 | OSQLError::ValueList errors; | 50 | OSQLError::ValueList errors; |
@@ -73,43 +75,71 @@ void OSQLiteDriver::setUserName( const QString& ) {} | |||
73 | 75 | ||
74 | void OSQLiteDriver::setPassword( const QString& ) {} | 76 | void OSQLiteDriver::setPassword( const QString& ) {} |
75 | 77 | ||
76 | 78 | ||
77 | void OSQLiteDriver::setUrl( const QString& url ) { | 79 | void OSQLiteDriver::setUrl( const QString& url ) { |
78 | m_url = url; | 80 | m_url = url; |
79 | } | 81 | } |
80 | 82 | ||
81 | 83 | ||
82 | void OSQLiteDriver::setOptions( const QStringList& ) { | 84 | void OSQLiteDriver::setOptions( const QStringList& ) { |
83 | } | 85 | } |
84 | 86 | ||
87 | /*------------------------------------------------------------------/* | ||
88 | * Functions to patch a regex search into sqlite | ||
89 | * -----------------------------------------------------------------*/ | ||
90 | int sqliteRlikeCompare(const char *zPattern, const char *zString){ | ||
91 | regex_t regex; | ||
92 | int res; | ||
93 | if ( zPattern==NULL || zString==NULL ) { | ||
94 | printf("One of the args was null!\n"); | ||
95 | return 0; | ||
96 | } | ||
97 | res = regcomp(®ex, zPattern, REG_EXTENDED); | ||
98 | if ( res != 0 ) { | ||
99 | printf("Regcomp failed with code %u on string %s\n",res,zPattern); | ||
100 | |||
101 | return 0; | ||
102 | } | ||
103 | res = (regexec(®ex, zString, 0, NULL, 0)==0); | ||
104 | regfree(®ex); | ||
105 | return res; | ||
106 | } | ||
107 | |||
108 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | ||
109 | if( argv[0]==0 || argv[1]==0 ) return; | ||
110 | sqlite_set_result_int(context, | ||
111 | sqliteRlikeCompare((const char*)argv[0], | ||
112 | (const char*)argv[1])); | ||
113 | } | ||
85 | 114 | ||
86 | /* | 115 | /* |
87 | * try to open a db specified via setUrl | 116 | * try to open a db specified via setUrl |
88 | * and options | 117 | * and options |
89 | */ | 118 | */ |
90 | bool OSQLiteDriver::open() { | 119 | bool OSQLiteDriver::open() { |
91 | char *error; | 120 | char *error; |
92 | qDebug("OSQLiteDriver::open: about to open"); | 121 | qDebug("OSQLiteDriver::open: about to open"); |
93 | m_sqlite = sqlite_open(m_url.local8Bit(), | 122 | m_sqlite = sqlite_open(m_url.local8Bit(), |
94 | 0, | 123 | 0, |
95 | &error ); | 124 | &error ); |
96 | 125 | ||
97 | /* failed to open */ | 126 | /* failed to open */ |
98 | if (m_sqlite == 0l ) { | 127 | if (m_sqlite == 0l ) { |
99 | // FIXME set the last error | 128 | // FIXME set the last error |
100 | qWarning("OSQLiteDriver::open: %s", error ); | 129 | qWarning("OSQLiteDriver::open: %s", error ); |
101 | free( error ); | 130 | free( error ); |
102 | return false; | 131 | return false; |
103 | } | 132 | } |
133 | sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,NULL); | ||
104 | return true; | 134 | return true; |
105 | } | 135 | } |
106 | 136 | ||
107 | 137 | ||
108 | /* close the db | 138 | /* close the db |
109 | * sqlite closes them without | 139 | * sqlite closes them without |
110 | * telling failure or success | 140 | * telling failure or success |
111 | */ | 141 | */ |
112 | bool OSQLiteDriver::close() { | 142 | bool OSQLiteDriver::close() { |
113 | if (m_sqlite ) | 143 | if (m_sqlite ) |
114 | sqlite_close( m_sqlite ), m_sqlite=0l; | 144 | sqlite_close( m_sqlite ), m_sqlite=0l; |
115 | 145 | ||