summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp8
-rw-r--r--libopie2/opiedb/osqlitedriver.h3
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp35
3 files changed, 38 insertions, 8 deletions
diff --git a/libopie2/opiedb/osqlitedriver.cpp b/libopie2/opiedb/osqlitedriver.cpp
index 3ba161e..ccac2f8 100644
--- a/libopie2/opiedb/osqlitedriver.cpp
+++ b/libopie2/opiedb/osqlitedriver.cpp
@@ -34,15 +34,15 @@
#include <opie2/odebug.h>
#include <stdlib.h>
-#include <regex.h>
#include <stdio.h>
// fromLocal8Bit() does not work as expected. Thus it
// is replaced by fromLatin1() (eilers)
#define __BUGGY_LOCAL8BIT_
-using namespace Opie::DB;
-using namespace Opie::DB::Internal;
+namespace Opie {
+namespace DB {
+namespace Internal {
namespace {
struct Query {
@@ -229,3 +229,5 @@ int OSQLiteDriver::call_back( void* voi, int argc,
}
+
+}}} // namespace OPIE::DB::Internal
diff --git a/libopie2/opiedb/osqlitedriver.h b/libopie2/opiedb/osqlitedriver.h
index d5ab224..33037b8 100644
--- a/libopie2/opiedb/osqlitedriver.h
+++ b/libopie2/opiedb/osqlitedriver.h
@@ -5,6 +5,9 @@
#if defined (__GNUC__) && (__GNUC__ < 3)
#include <sys/types.h>
#endif
+#ifdef Q_OS_MACX
+#include <sys/types.h>
+#endif
#include <regex.h>
#include "osqldriver.h"
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
index 3142f75..bb5c99b 100644
--- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
+++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp
@@ -601,18 +601,43 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const
{
+#if 1
QArray<int> nix(0);
return nix;
+
+#else
+ QString qu = "SELECT uid FROM addressbook WHERE (";
+ QString searchlist;
+
+ QStringList fieldList = OPimContactFields::untrfields( false );
+ // QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
+ for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
+ if ( !searchlist.isEmpty() )
+ searchlist += " OR ";
+ searchlist += "\"" + *it + "\" rlike(\"" + r.pattern() + "\") ";
+ }
+
+ qu = qu + searchlist + ")";
+
+ qDebug( "query: %s", qu.latin1() );
+
+ OSQLRawQuery raw( qu );
+ OSQLResult res = m_driver->query( &raw );
+
+ return extractUids( res );
+
+
+#endif
}
const uint OPimContactAccessBackend_SQL::querySettings()
{
return OPimContactAccess::IgnoreCase
- || OPimContactAccess::WildCards
- || OPimContactAccess::DateDiff
- || OPimContactAccess::DateYear
- || OPimContactAccess::DateMonth
- || OPimContactAccess::DateDay
+ | OPimContactAccess::WildCards
+ | OPimContactAccess::DateDiff
+ | OPimContactAccess::DateYear
+ | OPimContactAccess::DateMonth
+ | OPimContactAccess::DateDay
;
}