author | eilers <eilers> | 2004-04-10 17:13:14 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-04-10 17:13:14 (UTC) |
commit | 096b94bf150d2f3a2ef9a26940871ee7ffa58bdf (patch) (unidiff) | |
tree | c5cab0e19edc9aed9f8367a720619532ddac669c | |
parent | 4113636e53922f292477ca3f97035a624cf0450b (diff) | |
download | opie-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)
-rw-r--r-- | libopie2/opiedb/osqlitedriver.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiedb/osqlitedriver.h | 3 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp | 37 |
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 | |||
@@ -13,57 +13,57 @@ | |||
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 | ||
44 | using namespace Opie::DB; | 43 | namespace Opie { |
45 | using namespace Opie::DB::Internal; | 44 | namespace DB { |
45 | namespace Internal { | ||
46 | 46 | ||
47 | namespace { | 47 | namespace { |
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 | ||
56 | OSQLiteDriver::OSQLiteDriver( QLibrary *lib ) | 56 | OSQLiteDriver::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 | ||
63 | OSQLiteDriver::~OSQLiteDriver() { | 63 | OSQLiteDriver::~OSQLiteDriver() { |
64 | close(); | 64 | close(); |
65 | } | 65 | } |
66 | 66 | ||
67 | 67 | ||
68 | QString OSQLiteDriver::id()const { | 68 | QString OSQLiteDriver::id()const { |
69 | return QString::fromLatin1("SQLite"); | 69 | return QString::fromLatin1("SQLite"); |
@@ -208,24 +208,26 @@ int OSQLiteDriver::call_back( void* voi, int argc, | |||
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,31 +1,34 @@ | |||
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 | ||
14 | namespace Opie { | 17 | namespace Opie { |
15 | namespace DB { | 18 | namespace DB { |
16 | namespace Internal { | 19 | namespace Internal { |
17 | 20 | ||
18 | struct sqregex { | 21 | struct sqregex { |
19 | char *regex_raw; | 22 | char *regex_raw; |
20 | regex_t regex_c; | 23 | regex_t regex_c; |
21 | }; | 24 | }; |
22 | 25 | ||
23 | class OSQLiteDriver : public OSQLDriver { | 26 | class OSQLiteDriver : public OSQLDriver { |
24 | Q_OBJECT | 27 | Q_OBJECT |
25 | public: | 28 | public: |
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 ); |
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 | |||
@@ -578,62 +578,87 @@ QArray<int> OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &qu | |||
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 | ||
602 | QArray<int> OPimContactAccessBackend_SQL::matchRegexp( const QRegExp &r ) const | 602 | QArray<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 | ||
608 | const uint OPimContactAccessBackend_SQL::querySettings() | 633 | 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 | } |
618 | 643 | ||
619 | bool OPimContactAccessBackend_SQL::hasQuerySettings (uint querySettings) const | 644 | bool 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.. |