Some fixes to the namespace using.

the first test implementation of regexp-search for addressbook (disabled)

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
@@ -36,3 +36,2 @@
 #include <stdlib.h>
-#include <regex.h>
 #include <stdio.h>
@@ -43,4 +42,5 @@
 
-using namespace Opie::DB;
-using namespace Opie::DB::Internal;
+namespace Opie { 
+namespace DB { 
+namespace Internal {
 
@@ -231 +231,3 @@ 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
@@ -7,2 +7,5 @@
 #endif
+#ifdef Q_OS_MACX 
+#include <sys/types.h>
+#endif
 #include <regex.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
@@ -603,4 +603,29 @@ 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
 }
@@ -610,7 +635,7 @@ 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
                 ;