-rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.cpp | 22 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp index 661cd51..097142b 100644 --- a/libopie/pim/ocontactaccessbackend_xml.cpp +++ b/libopie/pim/ocontactaccessbackend_xml.cpp | |||
@@ -18,4 +18,7 @@ | |||
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.6 2003/07/07 16:19:47 eilers | ||
21 | * Fixing serious bug in hasQuerySettings() | ||
22 | * | ||
20 | * Revision 1.5 2003/04/13 18:07:10 zecke | 23 | * Revision 1.5 2003/04/13 18:07:10 zecke |
21 | * More API doc | 24 | * More API doc |
@@ -448,7 +451,24 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const | |||
448 | */ | 451 | */ |
449 | 452 | ||
453 | // Step 1: Check whether the given settings are supported by this backend | ||
454 | if ( ( querySettings & ( | ||
455 | OContactAccess::IgnoreCase | ||
456 | | OContactAccess::WildCards | ||
457 | | OContactAccess::DateDiff | ||
458 | | OContactAccess::DateYear | ||
459 | | OContactAccess::DateMonth | ||
460 | | OContactAccess::DateDay | ||
461 | | OContactAccess::RegExp | ||
462 | | OContactAccess::ExactMatch | ||
463 | ) ) != querySettings ) | ||
464 | return false; | ||
465 | |||
466 | // Step 2: Check whether the given combinations are ok.. | ||
467 | |||
468 | // IngoreCase alone is invalid | ||
450 | if ( querySettings == OContactAccess::IgnoreCase ) | 469 | if ( querySettings == OContactAccess::IgnoreCase ) |
451 | return false; | 470 | return false; |
452 | 471 | ||
472 | // WildCards, RegExp and ExactMatch should never used at the same time | ||
453 | switch ( querySettings & ~( OContactAccess::IgnoreCase | 473 | switch ( querySettings & ~( OContactAccess::IgnoreCase |
454 | | OContactAccess::DateDiff | 474 | | OContactAccess::DateDiff |
@@ -464,4 +484,6 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const | |||
464 | case OContactAccess::ExactMatch: | 484 | case OContactAccess::ExactMatch: |
465 | return ( true ); | 485 | return ( true ); |
486 | case 0: // one of the upper removed bits were set.. | ||
487 | return ( true ); | ||
466 | default: | 488 | default: |
467 | return ( false ); | 489 | return ( false ); |
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp index 661cd51..097142b 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | |||
@@ -18,4 +18,7 @@ | |||
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.6 2003/07/07 16:19:47 eilers | ||
21 | * Fixing serious bug in hasQuerySettings() | ||
22 | * | ||
20 | * Revision 1.5 2003/04/13 18:07:10 zecke | 23 | * Revision 1.5 2003/04/13 18:07:10 zecke |
21 | * More API doc | 24 | * More API doc |
@@ -448,7 +451,24 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const | |||
448 | */ | 451 | */ |
449 | 452 | ||
453 | // Step 1: Check whether the given settings are supported by this backend | ||
454 | if ( ( querySettings & ( | ||
455 | OContactAccess::IgnoreCase | ||
456 | | OContactAccess::WildCards | ||
457 | | OContactAccess::DateDiff | ||
458 | | OContactAccess::DateYear | ||
459 | | OContactAccess::DateMonth | ||
460 | | OContactAccess::DateDay | ||
461 | | OContactAccess::RegExp | ||
462 | | OContactAccess::ExactMatch | ||
463 | ) ) != querySettings ) | ||
464 | return false; | ||
465 | |||
466 | // Step 2: Check whether the given combinations are ok.. | ||
467 | |||
468 | // IngoreCase alone is invalid | ||
450 | if ( querySettings == OContactAccess::IgnoreCase ) | 469 | if ( querySettings == OContactAccess::IgnoreCase ) |
451 | return false; | 470 | return false; |
452 | 471 | ||
472 | // WildCards, RegExp and ExactMatch should never used at the same time | ||
453 | switch ( querySettings & ~( OContactAccess::IgnoreCase | 473 | switch ( querySettings & ~( OContactAccess::IgnoreCase |
454 | | OContactAccess::DateDiff | 474 | | OContactAccess::DateDiff |
@@ -464,4 +484,6 @@ bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const | |||
464 | case OContactAccess::ExactMatch: | 484 | case OContactAccess::ExactMatch: |
465 | return ( true ); | 485 | return ( true ); |
486 | case 0: // one of the upper removed bits were set.. | ||
487 | return ( true ); | ||
466 | default: | 488 | default: |
467 | return ( false ); | 489 | return ( false ); |