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
@@ -1,67 +1,70 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  2003/07/07 16:19:47  eilers
+ * Fixing serious bug in hasQuerySettings()
+ *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2003/03/21 14:32:54  mickeyl
  * g++ compliance fix: default arguments belong into the declaration, but not the definition
  *
  * Revision 1.3  2003/03/21 12:26:28  eilers
  * Fixing small bug: If we search a birthday from today to today, it returned
  * every contact ..
  *
  * Revision 1.2  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.1.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.1.2.1  2003/02/10 15:31:38  eilers
  * Writing offsets to debug output..
  *
  * Revision 1.1  2003/02/09 15:05:01  eilers
  * Nothing happened.. Just some cleanup before I will start..
  *
  * Revision 1.12  2003/01/03 16:58:03  eilers
  * Reenable debug output
  *
  * Revision 1.11  2003/01/03 12:31:28  eilers
  * Bugfix for calculating data diffs..
  *
  * 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
  * Moved journal-enum from ocontact into i the xml-backend..
  *
  * Revision 1.8  2002/11/14 17:04:24  eilers
  * Sorting will now work if fullname is identical on some entries
  *
  * Revision 1.7  2002/11/13 15:02:46  eilers
  * Small Bug in sorted fixed
  *
@@ -402,112 +405,131 @@ QArray<int> OContactAccessBackend_XML::queryByExample ( const OContact &query, i
                         m_currentQuery[arraycounter++] = (*it)->uid();
                 }
         }
 
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 }
 
 QArray<int> OContactAccessBackend_XML::matchRegexp(  const QRegExp &r ) const
 {
         QArray<int> m_currentQuery( m_contactList.count() );
         QListIterator<OContact> it( m_contactList );
         uint arraycounter = 0;
 
         for( ; it.current(); ++it ){
                 if ( (*it)->match( r ) ){
                         m_currentQuery[arraycounter++] = (*it)->uid();
                 }
 
         }
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 }
 
 const uint OContactAccessBackend_XML::querySettings()
 {
         return ( OContactAccess::WildCards
                  | OContactAccess::IgnoreCase
                  | OContactAccess::RegExp
                  | OContactAccess::ExactMatch
                  | OContactAccess::DateDiff
                  | OContactAccess::DateYear
                  | OContactAccess::DateMonth
                  | OContactAccess::DateDay
                  );
 }
 
 bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 {
         /* 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...
          */
 
+        // Step 1: Check whether the given settings are supported by this backend
+        if ( ( querySettings & ( 
+                                OContactAccess::IgnoreCase
+                                | OContactAccess::WildCards
+                                | OContactAccess::DateDiff
+                                | OContactAccess::DateYear
+                                | OContactAccess::DateMonth
+                                | OContactAccess::DateDay
+                                | OContactAccess::RegExp
+                                | OContactAccess::ExactMatch
+                               ) ) != querySettings )
+                return false;
+
+        // Step 2: Check whether the given combinations are ok..
+
+        // IngoreCase alone is invalid
         if ( querySettings == OContactAccess::IgnoreCase )
                 return false;
 
+        // WildCards, RegExp and ExactMatch should never used at the same time 
         switch ( querySettings & ~( OContactAccess::IgnoreCase
                                     | OContactAccess::DateDiff
                                     | OContactAccess::DateYear
                                     | OContactAccess::DateMonth
                                     | OContactAccess::DateDay
                                     )
                  ){
         case OContactAccess::RegExp:
                 return ( true );
         case OContactAccess::WildCards:
                 return ( true );
         case OContactAccess::ExactMatch:
                 return ( true );
+        case 0: // one of the upper removed bits were set..
+                return ( true );
         default:
                 return ( false );
         }
 }
 
 // Currently only asc implemented..
 QArray<int> OContactAccessBackend_XML::sorted( bool asc,  int , int ,  int )
 {
         QMap<QString, int> nameToUid;
         QStringList names;
         QArray<int> m_currentQuery( m_contactList.count() );
 
         // First fill map and StringList with all Names
         // Afterwards sort namelist and use map to fill array to return..
         QListIterator<OContact> it( m_contactList );
         for( ; it.current(); ++it ){
                 names.append( (*it)->fileAs() + QString::number( (*it)->uid() ) );
                 nameToUid.insert( (*it)->fileAs() + QString::number( (*it)->uid() ), (*it)->uid() );
         }
         names.sort();
 
         int i = 0;
         if ( asc ){
                 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
                         m_currentQuery[i++] = nameToUid[ (*it) ];
         }else{
                 for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
                         m_currentQuery[i++] = nameToUid[ (*it) ];
         }
 
         return m_currentQuery;
 
 }
 
 bool OContactAccessBackend_XML::add ( const OContact &newcontact )
 {
         //qWarning("odefaultbackend: ACTION::ADD");
         updateJournal (newcontact, ACTION_ADD);
         addContact_p( newcontact );
 
         m_changed = true;
 
         return true;
 }
 
 bool OContactAccessBackend_XML::replace ( const OContact &contact )
 {
         m_changed = true;
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
@@ -1,67 +1,70 @@
 /*
  * XML Backend for the OPIE-Contact Database.
  *
  * Copyright (c) 2002 by Stefan Eilers (Eilers.Stefan@epost.de)
  *
  * =====================================================================
          *This program is free software; you can redistribute it and/or
          *modify it under the terms of the GNU Library General Public
  *      License as published by the Free Software Foundation; either
  *      version 2 of the License, or (at your option) any later version.
  * =====================================================================
  * ToDo: XML-Backend: Automatic reload if something was changed...
  *
  *
  * =====================================================================
  * Version: $Id$
  * =====================================================================
  * History:
  * $Log$
+ * Revision 1.6  2003/07/07 16:19:47  eilers
+ * Fixing serious bug in hasQuerySettings()
+ *
  * Revision 1.5  2003/04/13 18:07:10  zecke
  * More API doc
  * QString -> const QString&
  * QString = 0l -> QString::null
  *
  * Revision 1.4  2003/03/21 14:32:54  mickeyl
  * g++ compliance fix: default arguments belong into the declaration, but not the definition
  *
  * Revision 1.3  2003/03/21 12:26:28  eilers
  * Fixing small bug: If we search a birthday from today to today, it returned
  * every contact ..
  *
  * Revision 1.2  2003/03/21 10:33:09  eilers
  * Merged speed optimized xml backend for contacts to main.
  * Added QDateTime to querybyexample. For instance, it is now possible to get
  * all Birthdays/Anniversaries between two dates. This should be used
  * to show all birthdays in the datebook..
  * This change is sourcecode backward compatible but you have to upgrade
  * the binaries for today-addressbook.
  *
  * Revision 1.1.2.2  2003/02/11 12:17:28  eilers
  * Speed optimization. Removed the sequential search loops.
  *
  * Revision 1.1.2.1  2003/02/10 15:31:38  eilers
  * Writing offsets to debug output..
  *
  * Revision 1.1  2003/02/09 15:05:01  eilers
  * Nothing happened.. Just some cleanup before I will start..
  *
  * Revision 1.12  2003/01/03 16:58:03  eilers
  * Reenable debug output
  *
  * Revision 1.11  2003/01/03 12:31:28  eilers
  * Bugfix for calculating data diffs..
  *
  * 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
  * Moved journal-enum from ocontact into i the xml-backend..
  *
  * Revision 1.8  2002/11/14 17:04:24  eilers
  * Sorting will now work if fullname is identical on some entries
  *
  * Revision 1.7  2002/11/13 15:02:46  eilers
  * Small Bug in sorted fixed
  *
@@ -402,112 +405,131 @@ QArray<int> OContactAccessBackend_XML::queryByExample ( const OContact &query, i
                         m_currentQuery[arraycounter++] = (*it)->uid();
                 }
         }
 
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 }
 
 QArray<int> OContactAccessBackend_XML::matchRegexp(  const QRegExp &r ) const
 {
         QArray<int> m_currentQuery( m_contactList.count() );
         QListIterator<OContact> it( m_contactList );
         uint arraycounter = 0;
 
         for( ; it.current(); ++it ){
                 if ( (*it)->match( r ) ){
                         m_currentQuery[arraycounter++] = (*it)->uid();
                 }
 
         }
         // Shrink to fit..
         m_currentQuery.resize(arraycounter);
 
         return m_currentQuery;
 }
 
 const uint OContactAccessBackend_XML::querySettings()
 {
         return ( OContactAccess::WildCards
                  | OContactAccess::IgnoreCase
                  | OContactAccess::RegExp
                  | OContactAccess::ExactMatch
                  | OContactAccess::DateDiff
                  | OContactAccess::DateYear
                  | OContactAccess::DateMonth
                  | OContactAccess::DateDay
                  );
 }
 
 bool OContactAccessBackend_XML::hasQuerySettings (uint querySettings) const
 {
         /* 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...
          */
 
+        // Step 1: Check whether the given settings are supported by this backend
+        if ( ( querySettings & ( 
+                                OContactAccess::IgnoreCase
+                                | OContactAccess::WildCards
+                                | OContactAccess::DateDiff
+                                | OContactAccess::DateYear
+                                | OContactAccess::DateMonth
+                                | OContactAccess::DateDay
+                                | OContactAccess::RegExp
+                                | OContactAccess::ExactMatch
+                               ) ) != querySettings )
+                return false;
+
+        // Step 2: Check whether the given combinations are ok..
+
+        // IngoreCase alone is invalid
         if ( querySettings == OContactAccess::IgnoreCase )
                 return false;
 
+        // WildCards, RegExp and ExactMatch should never used at the same time 
         switch ( querySettings & ~( OContactAccess::IgnoreCase
                                     | OContactAccess::DateDiff
                                     | OContactAccess::DateYear
                                     | OContactAccess::DateMonth
                                     | OContactAccess::DateDay
                                     )
                  ){
         case OContactAccess::RegExp:
                 return ( true );
         case OContactAccess::WildCards:
                 return ( true );
         case OContactAccess::ExactMatch:
                 return ( true );
+        case 0: // one of the upper removed bits were set..
+                return ( true );
         default:
                 return ( false );
         }
 }
 
 // Currently only asc implemented..
 QArray<int> OContactAccessBackend_XML::sorted( bool asc,  int , int ,  int )
 {
         QMap<QString, int> nameToUid;
         QStringList names;
         QArray<int> m_currentQuery( m_contactList.count() );
 
         // First fill map and StringList with all Names
         // Afterwards sort namelist and use map to fill array to return..
         QListIterator<OContact> it( m_contactList );
         for( ; it.current(); ++it ){
                 names.append( (*it)->fileAs() + QString::number( (*it)->uid() ) );
                 nameToUid.insert( (*it)->fileAs() + QString::number( (*it)->uid() ), (*it)->uid() );
         }
         names.sort();
 
         int i = 0;
         if ( asc ){
                 for ( QStringList::Iterator it = names.begin(); it != names.end(); ++it )
                         m_currentQuery[i++] = nameToUid[ (*it) ];
         }else{
                 for ( QStringList::Iterator it = names.end(); it != names.begin(); --it )
                         m_currentQuery[i++] = nameToUid[ (*it) ];
         }
 
         return m_currentQuery;
 
 }
 
 bool OContactAccessBackend_XML::add ( const OContact &newcontact )
 {
         //qWarning("odefaultbackend: ACTION::ADD");
         updateJournal (newcontact, ACTION_ADD);
         addContact_p( newcontact );
 
         m_changed = true;
 
         return true;
 }
 
 bool OContactAccessBackend_XML::replace ( const OContact &contact )
 {
         m_changed = true;