author | eilers <eilers> | 2003-01-02 14:27:12 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-01-02 14:27:12 (UTC) |
commit | 8a9fc13259d7c2797068752687a011f57f613251 (patch) (side-by-side diff) | |
tree | 26019057f2974c71881d9d7759732326cd0ede25 /libopie/pim/ocontactaccessbackend_xml.h | |
parent | 12e9ed4ac80ac7fa042059b48d7447db0e59a86c (diff) | |
download | opie-8a9fc13259d7c2797068752687a011f57f613251.zip opie-8a9fc13259d7c2797068752687a011f57f613251.tar.gz opie-8a9fc13259d7c2797068752687a011f57f613251.tar.bz2 |
Improved query by example: Search by date is possible.. First step
for a today plugin for birthdays..
Diffstat (limited to 'libopie/pim/ocontactaccessbackend_xml.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.h | 137 |
1 files changed, 104 insertions, 33 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h index c765ff5..c6e6cbc 100644 --- a/libopie/pim/ocontactaccessbackend_xml.h +++ b/libopie/pim/ocontactaccessbackend_xml.h @@ -19,2 +19,6 @@ * $Log$ + * Revision 1.10 2003/01/02 14:27:12 eilers + * Improved query by example: Search by date is possible.. First step + * for a today plugin for birthdays.. + * * Revision 1.9 2002/12/08 12:48:57 eilers @@ -62,2 +66,3 @@ #include <qmap.h> +#include <qdatetime.h> @@ -227,34 +232,85 @@ class OContactAccessBackend_XML : public OContactAccessBackend { */ + QDate* queryDate = 0l; + QDate* checkDate = 0l; bool allcorrect = true; - for ( int i = 0; i < Qtopia::rid; i++ ) { - /* Just compare fields which are not empty in the query object */ - if ( !query.field(i).isEmpty() ){ - switch ( settings & ~OContactAccess::IgnoreCase ){ - case OContactAccess::RegExp:{ - QRegExp expr ( query.field(i), - !(settings & OContactAccess::IgnoreCase), - false ); - if ( expr.find ( (*it).field(i), 0 ) == -1 ) - allcorrect = false; - } - break; - case OContactAccess::WildCards:{ - QRegExp expr ( query.field(i), - !(settings & OContactAccess::IgnoreCase), - true ); - if ( expr.find ( (*it).field(i), 0 ) == -1 ) - allcorrect = false; + for ( int i = 0; i < Qtopia::Groups; i++ ) { + // Birthday and anniversary are special nonstring fields and should + // be handled especially + switch ( i ){ + case Qtopia::Birthday: + queryDate = new QDate( query.birthday() ); + checkDate = new QDate( (*it).birthday() ); + case Qtopia::Anniversary: + if ( queryDate == 0l ){ + queryDate = new QDate( query.anniversary() ); + checkDate = new QDate( (*it).anniversary() ); } - break; - case OContactAccess::ExactMatch:{ - if (settings & OContactAccess::IgnoreCase){ - if ( query.field(i).upper() != - (*it).field(i).upper() ) + + if ( queryDate->isValid() ){ + if ( settings & OContactAccess::DateYear ){ + if ( queryDate->year() != checkDate->year() ) allcorrect = false; - }else{ - if ( query.field(i) != (*it).field(i) ) + } + if ( settings & OContactAccess::DateMonth ){ + if ( queryDate->month() != checkDate->month() ) allcorrect = false; + } + if ( settings & OContactAccess::DateDay ){ + if ( queryDate->day() != checkDate->day() ) + allcorrect = false; + } + if ( settings & OContactAccess::DateDiff ) { + QDate current = QDate::currentDate(); + if ( current.daysTo( *queryDate ) > 0 ){ + if ( !( ( *checkDate >= current ) && + ( *checkDate <= *queryDate ) ) ) + allcorrect = false; + } } } - break; + + delete queryDate; + queryDate = 0l; + delete checkDate; + checkDate = 0l; + break; + default: + /* Just compare fields which are not empty in the query object */ + if ( !query.field(i).isEmpty() ){ + switch ( settings & ~( OContactAccess::IgnoreCase + | OContactAccess::DateDiff + | OContactAccess::DateYear + | OContactAccess::DateMonth + | OContactAccess::DateDay + | OContactAccess::MatchOne + ) ){ + + case OContactAccess::RegExp:{ + QRegExp expr ( query.field(i), + !(settings & OContactAccess::IgnoreCase), + false ); + if ( expr.find ( (*it).field(i), 0 ) == -1 ) + allcorrect = false; + } + break; + case OContactAccess::WildCards:{ + QRegExp expr ( query.field(i), + !(settings & OContactAccess::IgnoreCase), + true ); + if ( expr.find ( (*it).field(i), 0 ) == -1 ) + allcorrect = false; + } + break; + case OContactAccess::ExactMatch:{ + if (settings & OContactAccess::IgnoreCase){ + if ( query.field(i).upper() != + (*it).field(i).upper() ) + allcorrect = false; + }else{ + if ( query.field(i) != (*it).field(i) ) + allcorrect = false; + } + } + break; + } } @@ -293,5 +349,10 @@ class OContactAccessBackend_XML : public OContactAccessBackend { return ( OContactAccess::WildCards - & OContactAccess::IgnoreCase - & OContactAccess::RegExp - & OContactAccess::ExactMatch ); + | OContactAccess::IgnoreCase + | OContactAccess::RegExp + | OContactAccess::ExactMatch + | OContactAccess::DateDiff + | OContactAccess::DateYear + | OContactAccess::DateMonth + | OContactAccess::DateDay + ); } @@ -300,7 +361,17 @@ class OContactAccessBackend_XML : public OContactAccessBackend { { - /* OContactAccess::IgnoreCase may be added with one - * of the other settings, but never used alone. - * The other settings are just valid alone... + /* OContactAccess::IgnoreCase, DateDiff, DateYear, DateMonth, DateDay + * may be added with any of the other settings. IgnoreCase should never used alone. + * Wildcards, RegExp, ExactMatch should never used at the same time... */ - switch ( querySettings & ~OContactAccess::IgnoreCase ){ + + if ( querySettings == OContactAccess::IgnoreCase ) + return false; + + switch ( querySettings & ~( OContactAccess::IgnoreCase + | OContactAccess::DateDiff + | OContactAccess::DateYear + | OContactAccess::DateMonth + | OContactAccess::DateDay + ) + ){ case OContactAccess::RegExp: |