summaryrefslogtreecommitdiff
path: root/libopie2
authoreilers <eilers>2004-04-10 17:13:14 (UTC)
committer eilers <eilers>2004-04-10 17:13:14 (UTC)
commit096b94bf150d2f3a2ef9a26940871ee7ffa58bdf (patch) (unidiff)
treec5cab0e19edc9aed9f8367a720619532ddac669c /libopie2
parent4113636e53922f292477ca3f97035a624cf0450b (diff)
downloadopie-096b94bf150d2f3a2ef9a26940871ee7ffa58bdf.zip
opie-096b94bf150d2f3a2ef9a26940871ee7ffa58bdf.tar.gz
opie-096b94bf150d2f3a2ef9a26940871ee7ffa58bdf.tar.bz2
Some fixes to the namespace using.
the first test implementation of regexp-search for addressbook (disabled)
Diffstat (limited to 'libopie2') (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiedb/osqlitedriver.cpp8
-rw-r--r--libopie2/opiedb/osqlitedriver.h3
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp37
3 files changed, 39 insertions, 9 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
@@ -35,5 +35,4 @@
35 35
36#include <stdlib.h> 36#include <stdlib.h>
37#include <regex.h>
38#include <stdio.h> 37#include <stdio.h>
39 38
@@ -42,6 +41,7 @@
42#define __BUGGY_LOCAL8BIT_ 41#define __BUGGY_LOCAL8BIT_
43 42
44using namespace Opie::DB; 43namespace Opie {
45using namespace Opie::DB::Internal; 44namespace DB {
45namespace Internal {
46 46
47namespace { 47namespace {
@@ -230,2 +230,4 @@ int OSQLiteDriver::call_back( void* voi, int argc,
230 230
231} 231}
232
233}}} // 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
@@ -6,4 +6,7 @@
6#include <sys/types.h> 6#include <sys/types.h>
7#endif 7#endif
8#ifdef Q_OS_MACX
9#include <sys/types.h>
10#endif
8#include <regex.h> 11#include <regex.h>
9 12
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
@@ -600,8 +600,33 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
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 QArray<int> nix(0); 605 QArray<int> nix(0);
605 return nix; 606 return nix;
607
608#else
609 QString qu = "SELECT uid FROM addressbook WHERE (";
610 QString searchlist;
611
612 QStringList fieldList = OPimContactFields::untrfields( false );
613 // QMap<QString, int> translate = OPimContactFields::untrFieldsToId();
614 for ( QStringList::Iterator it = ++fieldList.begin(); it != fieldList.end(); ++it ){
615 if ( !searchlist.isEmpty() )
616 searchlist += " OR ";
617 searchlist += "\"" + *it + "\" rlike(\"" + r.pattern() + "\") ";
618 }
619
620 qu = qu + searchlist + ")";
621
622 qDebug( "query: %s", qu.latin1() );
623
624 OSQLRawQuery raw( qu );
625 OSQLResult res = m_driver->query( &raw );
626
627 return extractUids( res );
628
629
630#endif
606} 631}
607 632
@@ -609,9 +634,9 @@ const uint OPimContactAccessBackend_SQL::querySettings()
609{ 634{
610 return OPimContactAccess::IgnoreCase 635 return OPimContactAccess::IgnoreCase
611 || OPimContactAccess::WildCards 636 | OPimContactAccess::WildCards
612 || OPimContactAccess::DateDiff 637 | OPimContactAccess::DateDiff
613 || OPimContactAccess::DateYear 638 | OPimContactAccess::DateYear
614 || OPimContactAccess::DateMonth 639 | OPimContactAccess::DateMonth
615 || OPimContactAccess::DateDay 640 | OPimContactAccess::DateDay
616 ; 641 ;
617} 642}