summaryrefslogtreecommitdiff
path: root/libopie2
Unidiff
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
@@ -5,73 +5,73 @@
5 .=l. 5 .=l.
6           .>+-= 6           .>+-=
7 _;:,     .>    :=|. This program is free software; you can 7 _;:,     .>    :=|. This program is free software; you can
8.> <`_,   >  .   <= redistribute it and/or modify it under 8.> <`_,   >  .   <= redistribute it and/or modify it under
9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public 9:`=1 )Y*s>-.--   : the terms of the GNU Library General Public
10.="- .-=="i,     .._ License as published by the Free Software 10.="- .-=="i,     .._ License as published by the Free Software
11 - .   .-<_>     .<> Foundation; either version 2 of the License, 11 - .   .-<_>     .<> Foundation; either version 2 of the License,
12     ._= =}       : or (at your option) any later version. 12     ._= =}       : or (at your option) any later version.
13    .%`+i>       _;_. 13    .%`+i>       _;_.
14    .i_,=:_.      -<s. This program is distributed in the hope that 14    .i_,=:_.      -<s. This program is distributed in the hope that
15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 15     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
16    : ..    .:,     . . . without even the implied warranty of 16    : ..    .:,     . . . without even the implied warranty of
17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 17    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 18  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
19..}^=.=       =       ; Library General Public License for more 19..}^=.=       =       ; Library General Public License for more
20++=   -.     .`     .: details. 20++=   -.     .`     .: details.
21 :     =  ...= . :.=- 21 :     =  ...= . :.=-
22 -.   .:....=;==+<; You should have received a copy of the GNU 22 -.   .:....=;==+<; You should have received a copy of the GNU
23  -_. . .   )=.  = Library General Public License along with 23  -_. . .   )=.  = Library General Public License along with
24    --        :-=` this library; see the file COPYING.LIB. 24    --        :-=` this library; see the file COPYING.LIB.
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 )
58{ 58{
59 m_sqlite = 0l; 59 m_sqlite = 0l;
60} 60}
61 61
62 62
63OSQLiteDriver::~OSQLiteDriver() { 63OSQLiteDriver::~OSQLiteDriver() {
64 close(); 64 close();
65} 65}
66 66
67 67
68QString OSQLiteDriver::id()const { 68QString OSQLiteDriver::id()const {
69 return QString::fromLatin1("SQLite"); 69 return QString::fromLatin1("SQLite");
70} 70}
71 71
72void OSQLiteDriver::setUserName( const QString& ) {} 72void OSQLiteDriver::setUserName( const QString& ) {}
73 73
74 74
75void OSQLiteDriver::setPassword( const QString& ) {} 75void OSQLiteDriver::setPassword( const QString& ) {}
76 76
77 77
@@ -200,32 +200,34 @@ int OSQLiteDriver::handleCallBack( int, char**, char** ) {
200} 200}
201 201
202 202
203/* callback_handler add the values to the list*/ 203/* callback_handler add the values to the list*/
204int OSQLiteDriver::call_back( void* voi, int argc, 204int OSQLiteDriver::call_back( void* voi, int argc,
205 char** argv, char** columns) { 205 char** argv, char** columns) {
206 Query* qu = (Query*)voi; 206 Query* qu = (Query*)voi;
207 207
208 //copy them over to a OSQLResultItem 208 //copy them over to a OSQLResultItem
209 QMap<QString, QString> tableString; 209 QMap<QString, QString> tableString;
210 QMap<int, QString> tableInt; 210 QMap<int, QString> tableInt;
211 for (int i = 0; i < argc; i++ ) { 211 for (int i = 0; i < argc; i++ ) {
212 212
213#ifdef __BUGGY_LOCAL8BIT_ 213#ifdef __BUGGY_LOCAL8BIT_
214 tableInt.insert( i, QString::fromLatin1( argv[i] ) ); 214 tableInt.insert( i, QString::fromLatin1( argv[i] ) );
215 tableString.insert( QString::fromLatin1( columns[i] ), 215 tableString.insert( QString::fromLatin1( columns[i] ),
216 QString::fromLatin1( argv[i] ) ); 216 QString::fromLatin1( argv[i] ) );
217#else 217#else
218 tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) ); 218 tableInt.insert( i, QString::fromLocal8Bit( argv[i] ) );
219 tableString.insert( QString::fromLocal8Bit( columns[i] ), 219 tableString.insert( QString::fromLocal8Bit( columns[i] ),
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,39 +1,42 @@
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;
20 regex_t regex_c; 23 regex_t regex_c;
21}; 24};
22 25
23class OSQLiteDriver : public OSQLDriver { 26class OSQLiteDriver : public OSQLDriver {
24 Q_OBJECT 27 Q_OBJECT
25public: 28public:
26 OSQLiteDriver( QLibrary *lib = 0l ); 29 OSQLiteDriver( QLibrary *lib = 0l );
27 ~OSQLiteDriver(); 30 ~OSQLiteDriver();
28 QString id()const; 31 QString id()const;
29 void setUserName( const QString& ); 32 void setUserName( const QString& );
30 void setPassword( const QString& ); 33 void setPassword( const QString& );
31 void setUrl( const QString& url ); 34 void setUrl( const QString& url );
32 void setOptions( const QStringList& ); 35 void setOptions( const QStringList& );
33 bool open(); 36 bool open();
34 bool close(); 37 bool close();
35 OSQLError lastError(); 38 OSQLError lastError();
36 OSQLResult query( OSQLQuery* ); 39 OSQLResult query( OSQLQuery* );
37 OSQLTable::ValueList tables()const; 40 OSQLTable::ValueList tables()const;
38 41
39private: 42private:
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
@@ -570,78 +570,103 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu
570 // Do exist a better solution to switch this ? 570 // Do exist a better solution to switch this ?
571 if ( settings & OPimContactAccess::IgnoreCase ) 571 if ( settings & OPimContactAccess::IgnoreCase )
572 searchQuery += "(\"" + *it + "\"" + " LIKE " + "'" 572 searchQuery += "(\"" + *it + "\"" + " LIKE " + "'"
573 + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")"; 573 + queryStr.replace(QRegExp("\\*"),"%") + "'" + ")";
574 else 574 else
575 searchQuery += "(\"" + *it + "\"" + " GLOB " + "'" 575 searchQuery += "(\"" + *it + "\"" + " GLOB " + "'"
576 + queryStr + "'" + ")"; 576 + queryStr + "'" + ")";
577 577
578 } 578 }
579 } 579 }
580 } 580 }
581 // Skip trailing "AND" 581 // Skip trailing "AND"
582 // if ( isAnyFieldSelected ) 582 // if ( isAnyFieldSelected )
583 // qu = qu.left( qu.length() - 4 ); 583 // qu = qu.left( qu.length() - 4 );
584 584
585 qu += searchQuery; 585 qu += searchQuery;
586 586
587 qDebug( "queryByExample query: %s", qu.latin1() ); 587 qDebug( "queryByExample query: %s", qu.latin1() );
588 588
589 // Execute query and return the received uid's 589 // Execute query and return the received uid's
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 & (
628 OPimContactAccess::IgnoreCase 653 OPimContactAccess::IgnoreCase
629 | OPimContactAccess::WildCards 654 | OPimContactAccess::WildCards
630 | OPimContactAccess::DateDiff 655 | OPimContactAccess::DateDiff
631 | OPimContactAccess::DateYear 656 | OPimContactAccess::DateYear
632 | OPimContactAccess::DateMonth 657 | OPimContactAccess::DateMonth
633 | OPimContactAccess::DateDay 658 | OPimContactAccess::DateDay
634 // | OPimContactAccess::RegExp 659 // | OPimContactAccess::RegExp
635 // | OPimContactAccess::ExactMatch 660 // | OPimContactAccess::ExactMatch
636 ) ) != querySettings ) 661 ) ) != querySettings )
637 return false; 662 return false;
638 663
639 // Step 2: Check whether the given combinations are ok.. 664 // Step 2: Check whether the given combinations are ok..
640 665
641 // IngoreCase alone is invalid 666 // IngoreCase alone is invalid
642 if ( querySettings == OPimContactAccess::IgnoreCase ) 667 if ( querySettings == OPimContactAccess::IgnoreCase )
643 return false; 668 return false;
644 669
645 // WildCards, RegExp and ExactMatch should never used at the same time 670 // WildCards, RegExp and ExactMatch should never used at the same time
646 switch ( querySettings & ~( OPimContactAccess::IgnoreCase 671 switch ( querySettings & ~( OPimContactAccess::IgnoreCase
647 | OPimContactAccess::DateDiff 672 | OPimContactAccess::DateDiff