summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp19
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp4
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
@@ -85,13 +85,12 @@ void OSQLiteDriver::setOptions( const QStringList& ) {
85 85
86/* 86/*
87 * Functions to patch a regex search into sqlite 87 * Functions to patch a regex search into sqlite
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);
95 regfree(&reg->regex_c); 94 regfree(&reg->regex_c);
96 } 95 }
97 reg->regex_raw = (char *)malloc(strlen(zPattern)+1); 96 reg->regex_raw = (char *)malloc(strlen(zPattern)+1);
@@ -106,53 +105,59 @@ int sqliteRlikeCompare(const char *zPattern, const char *zString, sqregex *reg){
106 } 105 }
107 res = (regexec(&reg->regex_c, zString, 0, NULL, 0)==0); 106 res = (regexec(&reg->regex_c, zString, 0, NULL, 0)==0);
108 return res; 107 return res;
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/*
122 * try to open a db specified via setUrl 121 * try to open a db specified via setUrl
123 * and options 122 * and options
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 );
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 qWarning("OSQLiteDriver::open: %s", error );
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
143 147
144/* close the db 148/* close the db
145 * sqlite closes them without 149 * sqlite closes them without
146 * telling failure or success 150 * telling failure or success
147 */ 151 */
148bool OSQLiteDriver::close() { 152bool 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 }
156 return true; 161 return true;
157} 162}
158 163
@@ -166,13 +171,13 @@ OSQLResult OSQLiteDriver::query( OSQLQuery* qu) {
166 } 171 }
167 Query query; 172 Query query;
168 query.driver = this; 173 query.driver = this;
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 }
176 181
177 OSQLResult result(OSQLResult::Success, 182 OSQLResult result(OSQLResult::Success,
178 query.items, 183 query.items,
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
@@ -598,26 +598,26 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
598 598
599 return list; 599 return list;
600} 600}
601 601
602QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const 602QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
603{ 603{
604#if 1 604#if 0
605 QArray<int> nix(0); 605 QArray<int> nix(0);
606 return nix; 606 return nix;
607 607
608#else 608#else
609 QString qu = "SELECT uid FROM addressbook WHERE ("; 609 QString qu = "SELECT uid FROM addressbook WHERE (";
610 QString searchlist; 610 QString searchlist;
611 611
612 QStringList fieldList = OPimContactFields::untrfields( false ); 612 QStringList fieldList = OPimContactFields::untrfields( false );
613 // QMap<QString, int> translate = OPimContactFields::untrFieldsToId(); 613 // QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
614 for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){ 614 for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
615 if ( !searchlist.isEmpty() ) 615 if ( !searchlist.isEmpty() )
616 searchlist += " OR "; 616 searchlist += " OR ";
617 searchlist += "\"" + *it + "\" rlike(\"" + r.pattern() + "\") "; 617 searchlist += " rlike(\""+ r.pattern() + "\",\"" + *it + "\") ";
618 } 618 }
619 619
620 qu = qu + searchlist + ")"; 620 qu = qu + searchlist + ")";
621 621
622 qDebug( "query: %s", qu.latin1() ); 622 qDebug( "query: %s", qu.latin1() );
623 623