-rw-r--r-- | libopie2/opiedb/osqlbackendmanager.cpp | 12 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 78 |
2 files changed, 48 insertions, 42 deletions
diff --git a/libopie2/opiedb/osqlbackendmanager.cpp b/libopie2/opiedb/osqlbackendmanager.cpp index fc18e07..bbfbf3d 100644 --- a/libopie2/opiedb/osqlbackendmanager.cpp +++ b/libopie2/opiedb/osqlbackendmanager.cpp | |||
@@ -1,10 +1,16 @@ | |||
1 | |||
2 | #include "osqlbackendmanager.h" | ||
3 | |||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | |||
7 | /* QT */ | ||
1 | #include <qdir.h> | 8 | #include <qdir.h> |
2 | #include <qmap.h> | 9 | #include <qmap.h> |
3 | 10 | ||
4 | #include "osqlbackendmanager.h" | ||
5 | 11 | ||
6 | /** | 12 | /** |
7 | * \todo FIXME CONFIG!!! | 13 | * \todo FIXME CONFIG!!! |
8 | */ | 14 | */ |
9 | 15 | ||
10 | namespace { | 16 | namespace { |
@@ -35,13 +41,13 @@ namespace { | |||
35 | return false; | 41 | return false; |
36 | QStringList list = QStringList::split( '\n', file.readAll() ); | 42 | QStringList list = QStringList::split( '\n', file.readAll() ); |
37 | QStringList::Iterator it; | 43 | QStringList::Iterator it; |
38 | QString line; | 44 | QString line; |
39 | for (it = list.begin(); it != list.end(); ++it ) { | 45 | for (it = list.begin(); it != list.end(); ++it ) { |
40 | line = (*it).stripWhiteSpace(); | 46 | line = (*it).stripWhiteSpace(); |
41 | qWarning("Anonymous::Config:" + line ); | 47 | owarn << "Anonymous::Config:" + line << oendl; |
42 | QStringList test = QStringList::split(' ', line ); | 48 | QStringList test = QStringList::split(' ', line ); |
43 | m_list.insert( test[0], test[2] ); | 49 | m_list.insert( test[0], test[2] ); |
44 | } | 50 | } |
45 | return true; | 51 | return true; |
46 | } | 52 | } |
47 | QString Config::value( const QString& key ) { | 53 | QString Config::value( const QString& key ) { |
@@ -89,13 +95,13 @@ OSQLBackEnd::ValueList OSQLBackEndManager::scanDir( const QString& dirName ) { | |||
89 | 95 | ||
90 | /** | 96 | /** |
91 | * read a config file and convert it to a OSQLBackEnd | 97 | * read a config file and convert it to a OSQLBackEnd |
92 | */ | 98 | */ |
93 | OSQLBackEnd OSQLBackEndManager::file2backend( const QString& file ) { | 99 | OSQLBackEnd OSQLBackEndManager::file2backend( const QString& file ) { |
94 | OSQLBackEnd end; | 100 | OSQLBackEnd end; |
95 | qWarning("fileName: " + file ); | 101 | owarn << "fileName: " + file << oendl; |
96 | Config cfg( file ); | 102 | Config cfg( file ); |
97 | if (cfg.load() ) { | 103 | if (cfg.load() ) { |
98 | end.setName( cfg.value( "Name") ); | 104 | end.setName( cfg.value( "Name") ); |
99 | end.setVendor( cfg.value("Vendor") ); | 105 | end.setVendor( cfg.value("Vendor") ); |
100 | end.setLicense( cfg.value("License") ); | 106 | end.setLicense( cfg.value("License") ); |
101 | end.setLibrary( cfg.value("Library").local8Bit() ); | 107 | end.setLibrary( cfg.value("Library").local8Bit() ); |
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp index 588fc8f..69eddfe 100644 --- a/libopie2/opiedb/osqlitedriver.cpp +++ b/libopie2/opiedb/osqlitedriver.cpp | |||
@@ -37,14 +37,14 @@ | |||
37 | #include <stdio.h> | 37 | #include <stdio.h> |
38 | 38 | ||
39 | // fromLocal8Bit() does not work as expected. Thus it | 39 | // fromLocal8Bit() does not work as expected. Thus it |
40 | // is replaced by fromLatin1() (eilers) | 40 | // is replaced by fromLatin1() (eilers) |
41 | #define __BUGGY_LOCAL8BIT_ | 41 | #define __BUGGY_LOCAL8BIT_ |
42 | 42 | ||
43 | namespace Opie { | 43 | namespace Opie { |
44 | namespace DB { | 44 | namespace DB { |
45 | namespace Internal { | 45 | namespace Internal { |
46 | 46 | ||
47 | namespace { | 47 | namespace { |
48 | struct Query { | 48 | struct Query { |
49 | OSQLError::ValueList errors; | 49 | OSQLError::ValueList errors; |
50 | OSQLResultItem::ValueList items; | 50 | OSQLResultItem::ValueList items; |
@@ -84,83 +84,83 @@ void OSQLiteDriver::setOptions( const QStringList& ) { | |||
84 | } | 84 | } |
85 | 85 | ||
86 | /* | 86 | /* |
87 | * Functions to patch a regex search into sqlite | 87 | * Functions to patch a regex search into sqlite |
88 | */ | 88 | */ |
89 | int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ | 89 | int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){ |
90 | int res; | 90 | int res; |
91 | if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){ | 91 | if (reg->regex_raw == NULL || (strcmp (zPattern, reg->regex_raw) != 0)){ |
92 | if (reg->regex_raw != NULL) { | 92 | if (reg->regex_raw != NULL) { |
93 | free(reg->regex_raw); | 93 | free(reg->regex_raw); |
94 | regfree(®->regex_c); | 94 | regfree(®->regex_c); |
95 | } | 95 | } |
96 | reg->regex_raw = (char *)malloc(strlen(zPattern)+1); | 96 | reg->regex_raw = (char *)malloc(strlen(zPattern)+1); |
97 | strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1); | 97 | strncpy(reg->regex_raw, zPattern, strlen(zPattern)+1); |
98 | res = regcomp(®->regex_c, zPattern, REG_EXTENDED); | 98 | res = regcomp(®->regex_c, zPattern, REG_EXTENDED); |
99 | if ( res != 0 ) { | 99 | if ( res != 0 ) { |
100 | printf("Regcomp failed with code %u on string %s\n",res,zPattern); | 100 | printf("Regcomp failed with code %u on string %s\n",res,zPattern); |
101 | free(reg->regex_raw); | 101 | free(reg->regex_raw); |
102 | reg->regex_raw=NULL; | 102 | reg->regex_raw=NULL; |
103 | return 0; | 103 | return 0; |
104 | } | 104 | } |
105 | } | 105 | } |
106 | res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); | 106 | res = (regexec(®->regex_c, zString, 0, NULL, 0)==0); |
107 | return res; | 107 | return res; |
108 | } | 108 | } |
109 | 109 | ||
110 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ | 110 | void rlikeFunc(sqlite_func *context, int arg, const char **argv){ |
111 | if( argv[0]==0 || argv[1]==0 ){ | 111 | if( argv[0]==0 || argv[1]==0 ){ |
112 | printf("One of arguments Null!!\n"); | 112 | printf("One of arguments Null!!\n"); |
113 | return; | 113 | return; |
114 | } | 114 | } |
115 | sqlite_set_result_int(context, | 115 | sqlite_set_result_int(context, |
116 | sqliteRlikeCompare((const char*)argv[0], | 116 | sqliteRlikeCompare((const char*)argv[0], |
117 | (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); | 117 | (const char*)argv[1], (sqregex *)sqlite_user_data(context) )); |
118 | } | 118 | } |
119 | 119 | ||
120 | /* | 120 | /* |
121 | * try to open a db specified via setUrl | 121 | * try to open a db specified via setUrl |
122 | * and options | 122 | * and options |
123 | */ | 123 | */ |
124 | bool OSQLiteDriver::open() { | 124 | bool OSQLiteDriver::open() { |
125 | char *error; | 125 | char *error; |
126 | 126 | ||
127 | qDebug("OSQLiteDriver::open: about to open"); | 127 | odebug << "OSQLiteDriver::open: about to open" << oendl; |
128 | m_sqlite = sqlite_open(m_url.local8Bit(), | 128 | m_sqlite = sqlite_open(m_url.local8Bit(), |
129 | 0, | 129 | 0, |
130 | &error ); | 130 | &error ); |
131 | 131 | ||
132 | /* failed to open */ | 132 | /* failed to open */ |
133 | if (m_sqlite == 0l ) { | 133 | if (m_sqlite == 0l ) { |
134 | // FIXME set the last error | 134 | // FIXME set the last error |
135 | qWarning("OSQLiteDriver::open: %s", error ); | 135 | owarn << "OSQLiteDriver::open: " << error << "" << oendl; |
136 | free( error ); | 136 | free( error ); |
137 | return false; | 137 | return false; |
138 | } | 138 | } |
139 | if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) | 139 | if (sqlite_create_function(m_sqlite,"rlike",2,rlikeFunc,&sqreg) != 0) |
140 | odebug << "Unable to create user defined function!" << oendl; | 140 | odebug << "Unable to create user defined function!" << oendl; |
141 | if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0) | 141 | if (sqlite_function_type(m_sqlite,"rlike",SQLITE_NUMERIC) != 0) |
142 | odebug << "Unable to set rlike function result type!" << oendl; | 142 | odebug << "Unable to set rlike function result type!" << oendl; |
143 | sqreg.regex_raw = NULL; | 143 | sqreg.regex_raw = NULL; |
144 | return true; | 144 | return true; |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | /* close the db | 148 | /* close the db |
149 | * sqlite closes them without | 149 | * sqlite closes them without |
150 | * telling failure or success | 150 | * telling failure or success |
151 | */ | 151 | */ |
152 | bool OSQLiteDriver::close() { | 152 | bool OSQLiteDriver::close() { |
153 | if (m_sqlite ) | 153 | if (m_sqlite ) |
154 | sqlite_close( m_sqlite ), m_sqlite=0l; | 154 | sqlite_close( m_sqlite ), m_sqlite=0l; |
155 | if (sqreg.regex_raw != NULL){ | 155 | if (sqreg.regex_raw != NULL){ |
156 | odebug << "Freeing regex on close" << oendl; | 156 | odebug << "Freeing regex on close" << oendl; |
157 | free(sqreg.regex_raw); | 157 | free(sqreg.regex_raw); |
158 | sqreg.regex_raw=NULL; | 158 | sqreg.regex_raw=NULL; |
159 | regfree(&sqreg.regex_c); | 159 | regfree(&sqreg.regex_c); |
160 | } | 160 | } |
161 | return true; | 161 | return true; |
162 | } | 162 | } |
163 | 163 | ||
164 | 164 | ||
165 | /* Query */ | 165 | /* Query */ |
166 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | 166 | OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { |
@@ -171,13 +171,13 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) { | |||
171 | } | 171 | } |
172 | Query query; | 172 | Query query; |
173 | query.driver = this; | 173 | query.driver = this; |
174 | char *err; | 174 | char *err; |
175 | /* SQLITE_OK 0 if return code > 0 == failure */ | 175 | /* SQLITE_OK 0 if return code > 0 == failure */ |
176 | 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 ) { |
177 | qWarning("OSQLiteDriver::query: Error while executing %s",err); | 177 | owarn << "OSQLiteDriver::query: Error while executing " << err << "" << oendl; |
178 | free(err ); | 178 | free(err ); |
179 | // FixMe Errors | 179 | // FixMe Errors |
180 | } | 180 | } |
181 | 181 | ||
182 | OSQLResult result(OSQLResult::Success, | 182 | OSQLResult result(OSQLResult::Success, |
183 | query.items, | 183 | query.items, |