summaryrefslogtreecommitdiff
Unidiff
Diffstat (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
@@ -25,33 +25,33 @@
25 If not, write to the Free Software Foundation, 25 If not, write to the Free Software Foundation,
26 Inc., 59 Temple Place - Suite 330, 26 Inc., 59 Temple Place - Suite 330,
27 Boston, MA 02111-1307, USA. 27 Boston, MA 02111-1307, USA.
28 28
29*/ 29*/
30 30
31#include "osqlquery.h" 31#include "osqlquery.h"
32#include "osqlitedriver.h" 32#include "osqlitedriver.h"
33 33
34#include <opie2/odebug.h> 34#include <opie2/odebug.h>
35 35
36#include <stdlib.h> 36#include <stdlib.h>
37#include <regex.h>
38#include <stdio.h> 37#include <stdio.h>
39 38
40// fromLocal8Bit() does not work as expected. Thus it 39// fromLocal8Bit() does not work as expected. Thus it
41// is replaced by fromLatin1() (eilers) 40// is replaced by fromLatin1() (eilers)
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 {
48 struct Query { 48 struct Query {
49 OSQLError::ValueList errors; 49 OSQLError::ValueList errors;
50 OSQLResultItem::ValueList items; 50 OSQLResultItem::ValueList items;
51 OSQLiteDriver *driver; 51 OSQLiteDriver *driver;
52 }; 52 };
53} 53}
54 54
55 55
56OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) 56OSQLiteDriver::OSQLiteDriver( QLibrary *lib )
57 : OSQLDriver( lib ) 57 : OSQLDriver( lib )
@@ -220,12 +220,14 @@ int OSQLiteDriver::call_back( void* voi, int argc,
220 QString::fromLocal8Bit( argv[i] ) ); 220 QString::fromLocal8Bit( argv[i] ) );
221#endif 221#endif
222 } 222 }
223 OSQLResultItem item( tableString, tableInt ); 223 OSQLResultItem item( tableString, tableInt );
224 qu->items.append( item ); 224 qu->items.append( item );
225 225
226 return ((Query*)voi)->driver->handleCallBack( argc, 226 return ((Query*)voi)->driver->handleCallBack( argc,
227 argv, 227 argv,
228 columns ); 228 columns );
229 229
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
@@ -1,19 +1,22 @@
1#ifndef OSQL_LITE_DRIVER_H 1#ifndef OSQL_LITE_DRIVER_H
2#define OSQL_LITE_DRIVER_H 2#define OSQL_LITE_DRIVER_H
3 3
4#include <sqlite.h> 4#include <sqlite.h>
5#if defined (__GNUC__) && (__GNUC__ < 3) 5#if defined (__GNUC__) && (__GNUC__ < 3)
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
10#include "osqldriver.h" 13#include "osqldriver.h"
11#include "osqlerror.h" 14#include "osqlerror.h"
12#include "osqlresult.h" 15#include "osqlresult.h"
13 16
14namespace Opie { 17namespace Opie {
15namespace DB { 18namespace DB {
16namespace Internal { 19namespace Internal {
17 20
18struct sqregex { 21struct sqregex {
19 char *regex_raw; 22 char *regex_raw;
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
@@ -590,38 +590,63 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
590 OSQLRawQuery raw( qu ); 590 OSQLRawQuery raw( qu );
591 OSQLResult res = m_driver->query( &raw ); 591 OSQLResult res = m_driver->query( &raw );
592 if ( res.state() != OSQLResult::Success ){ 592 if ( res.state() != OSQLResult::Success ){
593 QArray<int> empty; 593 QArray<int> empty;
594 return empty; 594 return empty;
595 } 595 }
596 596
597 QArray<int> list = extractUids( res ); 597 QArray<int> list = extractUids( res );
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 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
608const uint OPimContactAccessBackend_SQL::querySettings() 633const 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}
618 643
619bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const 644bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const
620{ 645{
621 /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay 646 /* OPimContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay
622 * may be added with any of the other settings. IgnoreCase should never used alone. 647 * may be added with any of the other settings. IgnoreCase should never used alone.
623 * Wildcards, RegExp, ExactMatch should never used at the same time... 648 * Wildcards, RegExp, ExactMatch should never used at the same time...
624 */ 649 */
625 650
626 // Step 1: Check whether the given settings are supported by this backend 651 // Step 1: Check whether the given settings are supported by this backend
627 if ( ( querySettings & ( 652 if ( ( querySettings & (