From 47c87c92a46f56bc9190025e7a653fa48718431e Mon Sep 17 00:00:00 2001 From: eilers Date: Tue, 28 Dec 2004 14:19:26 +0000 Subject: Fixing bug #1501 and preparing for implementation of generic QueryByExample and sorted for datebook and todo.. --- diff --git a/libopie2/opiepim/ChangeLog b/libopie2/opiepim/ChangeLog index 564e92a..2007744 100644 --- a/libopie2/opiepim/ChangeLog +++ b/libopie2/opiepim/ChangeLog @@ -1,6 +1,8 @@ 2004-12-28 Stefan Eilers * Make improved query by example accessable via frontend - * Some API improvement + * Some API documentation improvement + * Cleanup of backend api.. + * Fixing bug #1501 2004-11-23 Stefan Eilers * Implement fast and full featured version of sorted() for addressbook * Implement generic queryByExample for all Addressboook backends. It allows incremental search. diff --git a/libopie2/opiepim/backend/ocontactaccessbackend.h b/libopie2/opiepim/backend/ocontactaccessbackend.h index ee6dbc2..27d70ab 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend.h @@ -80,13 +80,13 @@ class OPimContactAccessBackend: public OPimAccessBackend { * @return All settings provided by the current backend * (i.e.: query_WildCards & query_IgnoreCase) */ - virtual const uint querySettings() const; + const uint querySettings() const; /** * Check whether settings are correct. * @return true if the given settings are correct and possible. */ - virtual bool hasQuerySettings (uint querySettings) const; + bool hasQuerySettings (uint querySettings) const; /** * Advanced search mechanism. diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp index 9375f43..2368865 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.cpp @@ -279,7 +279,9 @@ namespace { RemoveQuery::RemoveQuery(int uid ) : OSQLQuery(), m_uid( uid ) {} + RemoveQuery::~RemoveQuery() {} + QString RemoveQuery::query()const { QString qu = "DELETE from addressbook where uid = " + QString::number(m_uid) + ";"; @@ -289,8 +291,6 @@ namespace { } - - FindQuery::FindQuery(int uid) : OSQLQuery(), m_uid( uid ) { } @@ -300,12 +300,14 @@ namespace { FindQuery::~FindQuery() { } QString FindQuery::query()const{ - if ( m_uids.count() == 0 ) - return single(); - else - return multi(); + if ( m_uids.count() == 0 ) + return single(); + else + return multi(); } + + QString FindQuery::multi()const { QString qu = "select * from addressbook where"; for (uint i = 0; i < m_uids.count(); i++ ) { @@ -528,10 +530,23 @@ OPimContact OPimContactAccessBackend_SQL::find( int uid, const UIDArray& queryUi } -UIDArray OPimContactAccessBackend_SQL::queryByExample ( const OPimContact &query, int settings, +UIDArray OPimContactAccessBackend_SQL::queryByExample ( const UIDArray& uidlist, const OPimContact &query, int settings, const QDateTime& qd ) const { QString qu = "SELECT uid FROM addressbook WHERE"; + + // Just add uid's selection if we really try to search in a subset of all uids! Otherwise this would + // just take time and memory! + if ( uidlist.count() != m_uids.count() ) { + qu += " ("; + + for ( uint i = 0; i < uidlist.count(); i++ ) { + qu += " uid = " + QString::number( uidlist[i] ) + " OR"; + } + qu.remove( qu.length()-2, 2 ); // Hmmmm.. + qu += " ) AND "; + } + QString searchQuery =""; QDate startDate; diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h index 299c175..1cf1185 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_sql.h +++ b/libopie2/opiepim/backend/ocontactaccessbackend_sql.h @@ -75,7 +75,7 @@ class OPimContactAccessBackend_SQL : public OPimContactAccessBackend { OPimContact find( int uid ) const; OPimContact find( int uid, const UIDArray& items, uint cur, Frontend::CacheDirection ) const; - UIDArray queryByExample ( const OPimContact &query, int settings, + UIDArray queryByExample ( const UIDArray& uidlist, const OPimContact &query, int settings, const QDateTime& d ) const; UIDArray matchRegexp( const QRegExp &r ) const; diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.cpp b/libopie2/opiepim/backend/odatebookaccessbackend.cpp index 73c7059..e44912a 100644 --- a/libopie2/opiepim/backend/odatebookaccessbackend.cpp +++ b/libopie2/opiepim/backend/odatebookaccessbackend.cpp @@ -100,14 +100,17 @@ OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDate& fr return tmpList; } -OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDateTime& dt )const { + +OPimBackendOccurrence::List ODateBookAccessBackend::occurrences( const QDateTime& dt )const +{ OPimBackendOccurrence::List day = occurrences( dt.date(), dt.date() ); return filterOccurrences( day, dt ); } OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDate& from, - const QDate& to )const { + const QDate& to )const +{ OPimBackendOccurrence::List tmpList; OPimEvent::ValueList list = directNonRepeats(); @@ -116,14 +119,28 @@ OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( return tmpList; } -OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDateTime& dt )const { +OPimBackendOccurrence::List ODateBookAccessBackend::effectiveNonRepeatingEvents( const QDateTime& dt )const +{ OPimBackendOccurrence::List day = effectiveNonRepeatingEvents( dt.date(), dt.date() ); return filterOccurrences( day,dt ); } +const uint ODateBookAccessBackend::querySettings() const +{ + return 0; +} + +bool ODateBookAccessBackend::hasQuerySettings (uint querySettings) const +{ + return false; +} + + -UIDArray ODateBookAccessBackend::queryByExample( const OPimEvent&, int settings, - const QDateTime& d )const { +UIDArray ODateBookAccessBackend::queryByExample( const UIDArray& uidlist, const OPimEvent&, int settings, + const QDateTime& d )const +{ + qDebug( "Accessing ODateBookAccessBackend::queryByExample() which is not implemented!" ); return UIDArray(); } diff --git a/libopie2/opiepim/backend/odatebookaccessbackend.h b/libopie2/opiepim/backend/odatebookaccessbackend.h index 8927ca1..91f63aa 100644 --- a/libopie2/opiepim/backend/odatebookaccessbackend.h +++ b/libopie2/opiepim/backend/odatebookaccessbackend.h @@ -94,7 +94,20 @@ public: * and occurrences */ //@{ - UIDArray queryByExample( const OPimEvent&, int settings, const QDateTime& d = QDateTime() )const; + /** + * Return all possible settings. + * @return All settings provided by the current backend + * (i.e.: query_WildCards & query_IgnoreCase) + */ + const uint querySettings() const; + + /** + * Check whether settings are correct. + * @return true if the given settings are correct and possible. + */ + bool hasQuerySettings (uint querySettings) const; + + UIDArray queryByExample( const UIDArray& uidlist, const OPimEvent&, int settings, const QDateTime& d = QDateTime() )const; UIDArray sorted( const UIDArray&, bool asc, int, int, const QArray& )const; OPimBackendOccurrence::List occurrences( const QDate&, const QDate& end )const; OPimBackendOccurrence::List occurrences( const QDateTime& )const; diff --git a/libopie2/opiepim/backend/opimaccessbackend.h b/libopie2/opiepim/backend/opimaccessbackend.h index 7321758..6666fd6 100644 --- a/libopie2/opiepim/backend/opimaccessbackend.h +++ b/libopie2/opiepim/backend/opimaccessbackend.h @@ -75,14 +75,14 @@ public: * (i.e.: query_WildCards & query_IgnoreCase) * See implementation in the specific backends for contacts, todo and dates. */ - virtual const uint querySettings() const { return 0; } /* FIXME: Make Abstrakt !! = 0; */ + virtual const uint querySettings() const = 0; /** * Check whether settings are correct for queryByExample() * See implementation in the specific backends for OPimContactAccess, OPimTodoAccess and ODateBookAccess. * @return true if the given settings are correct and possible. */ - virtual bool hasQuerySettings (uint querySettings) const { return false; } /* FIXME: Make Abstrakt !! = 0; */ + virtual bool hasQuerySettings (uint querySettings) const = 0; //@} @@ -90,7 +90,7 @@ public: virtual UIDArray allRecords()const = 0; virtual UIDArray matchRegexp(const QRegExp &r) const; virtual UIDArray queryByExample( const UIDArray&, const T& t, - int settings, const QDateTime& d = QDateTime() )const { return UIDArray(); } /* FIXME: Make Abstrakt !! = 0; */ + int settings, const QDateTime& d = QDateTime() )const = 0; virtual UIDArray queryByExample( const T& t, int settings, const QDateTime& d = QDateTime() )const; virtual UIDArray queryByExample( const OPimRecord* rec, int settings, const QDateTime& d = QDateTime() )const; virtual UIDArray sorted( const UIDArray&, bool asc, int sortOrder, int sortFilter, const QArray& cats )const = 0; diff --git a/libopie2/opiepim/backend/otodoaccessbackend.cpp b/libopie2/opiepim/backend/otodoaccessbackend.cpp index 5f86be9..f979976 100644 --- a/libopie2/opiepim/backend/otodoaccessbackend.cpp +++ b/libopie2/opiepim/backend/otodoaccessbackend.cpp @@ -42,9 +42,35 @@ OPimTodoAccessBackend::~OPimTodoAccessBackend() { } -UIDArray OPimTodoAccessBackend::queryByExample( const OPimTodo&, int settings, - const QDateTime& d)const { - return UIDArray(); +const uint OPimTodoAccessBackend::querySettings() const +{ + return 0; +} + +bool OPimTodoAccessBackend::hasQuerySettings (uint querySettings) const +{ + return false; +} + + +UIDArray OPimTodoAccessBackend::queryByExample( const UIDArray& uidlist, const OPimTodo& query, int settings, + const QDateTime& endperiod )const +{ + qDebug( "Accessing OPimTodoAccessBackend::queryByExample() which is not implemented!" ); + return UIDArray(); + +// odebug << "Using Unaccelerated OPimContactAccessBackend implementation of queryByExample!" << oendl; + +// UIDArray m_currentQuery( uid_array.count() ); +// uint arraycounter = 0; + +// for( uint it = 0; it < uid_array.count(); ++it ){ +// /* Search all fields and compare them with query object. Store them into list +// * if all fields matches. +// */ +// } + + } UIDArray OPimTodoAccessBackend::sorted( const UIDArray& events, bool asc, diff --git a/libopie2/opiepim/backend/otodoaccessbackend.h b/libopie2/opiepim/backend/otodoaccessbackend.h index 66297bb..870ee57 100644 --- a/libopie2/opiepim/backend/otodoaccessbackend.h +++ b/libopie2/opiepim/backend/otodoaccessbackend.h @@ -51,7 +51,20 @@ public: * and occurrences */ //@{ - UIDArray queryByExample( const OPimTodo&, int settings, const QDateTime& d = QDateTime() )const; + /** + * Return all possible settings. + * @return All settings provided by the current backend + * (i.e.: query_WildCards & query_IgnoreCase) + */ + const uint querySettings() const; + + /** + * Check whether settings are correct. + * @return true if the given settings are correct and possible. + */ + bool hasQuerySettings (uint querySettings) const; + + UIDArray queryByExample( const UIDArray& uidlist, const OPimTodo& query, int settings, const QDateTime& endperiod = QDateTime() )const; UIDArray sorted( const UIDArray&, bool asc, int, int, const QArray& )const; OPimBackendOccurrence::List occurrences( const QDate&, const QDate& )const; //@} diff --git a/libopie2/opiepim/backend/otodoaccesssql.cpp b/libopie2/opiepim/backend/otodoaccesssql.cpp index 2bcab29..70e40e4 100644 --- a/libopie2/opiepim/backend/otodoaccesssql.cpp +++ b/libopie2/opiepim/backend/otodoaccesssql.cpp @@ -301,10 +301,12 @@ namespace { RemoveQuery::RemoveQuery(int uid ) : OSQLQuery(), m_uid( uid ) {} + RemoveQuery::~RemoveQuery() {} + QString RemoveQuery::query()const { QString qu = "DELETE FROM todolist WHERE uid = " + QString::number(m_uid) + " ;"; - qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid); + qu += "DELETE FROM custom_data WHERE uid = " + QString::number(m_uid); return qu; } @@ -312,18 +314,26 @@ namespace { ClearQuery::ClearQuery() : OSQLQuery() {} ClearQuery::~ClearQuery() {} - QString ClearQuery::query()const { - QString qu = "drop table todolist"; - return qu; + QString ClearQuery::query()const + { + QString qu = "drop table todolist"; + return qu; } + FindQuery::FindQuery(int uid) - : OSQLQuery(), m_uid(uid ) { + : OSQLQuery(), m_uid(uid ) + { } + FindQuery::FindQuery(const QArray& ints) - : OSQLQuery(), m_uids(ints){ + : OSQLQuery(), m_uids(ints) + { } - FindQuery::~FindQuery() { + + FindQuery::~FindQuery() + { } + QString FindQuery::query()const{ if (m_uids.count() == 0 ) return single(); @@ -448,10 +458,10 @@ QArray OPimTodoAccessBackendSQL::allRecords()const { return m_uids; } -QArray OPimTodoAccessBackendSQL::queryByExample( const OPimTodo& , int, const QDateTime& ){ - QArray ints(0); - return ints; -} +// QArray OPimTodoAccessBackendSQL::queryByExample( const UIDArray& uidlist, const OPimTodo& , int, const QDateTime& ){ +// QArray ints(0); +// return ints; +// } OPimTodo OPimTodoAccessBackendSQL::find(int uid ) const{ FindQuery query( uid ); return parseResultAndCache( uid, m_driver->query(&query) ); @@ -619,7 +629,7 @@ QArray OPimTodoAccessBackendSQL::sorted( bool asc, int sortOrder, bool OPimTodoAccessBackendSQL::date( QDate& da, const QString& str ) const{ - if ( str == "0-0-0" ) + if ( str == "0000-00-00" ) return false; else{ int day, year, month; diff --git a/libopie2/opiepim/backend/otodoaccesssql.h b/libopie2/opiepim/backend/otodoaccesssql.h index 0ba8f3a..ac3476a 100644 --- a/libopie2/opiepim/backend/otodoaccesssql.h +++ b/libopie2/opiepim/backend/otodoaccesssql.h @@ -53,7 +53,7 @@ public: bool save(); QArray allRecords()const; - QArray queryByExample( const OPimTodo& t, int settings, const QDateTime& d = QDateTime() ); +/* QArray queryByExample( const UIDArray& uidlist, const OPimTodo& t, int settings, const QDateTime& d = QDateTime() ); */ OPimTodo find(UID uid)const; OPimTodo find(UID uid, const QArray&, uint cur, Frontend::CacheDirection )const; void clear(); diff --git a/libopie2/opiepim/backend/otodoaccessxml.cpp b/libopie2/opiepim/backend/otodoaccessxml.cpp index 273f91a..ab50604 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.cpp +++ b/libopie2/opiepim/backend/otodoaccessxml.cpp @@ -326,10 +326,7 @@ QArray OPimTodoAccessXML::allRecords()const { return ids; } -QArray OPimTodoAccessXML::queryByExample( const OPimTodo&, int, const QDateTime& ) { - QArray ids(0); - return ids; -} + OPimTodo OPimTodoAccessXML::find( int uid )const { OPimTodo todo; todo.setUid( 0 ); // isEmpty() diff --git a/libopie2/opiepim/backend/otodoaccessxml.h b/libopie2/opiepim/backend/otodoaccessxml.h index 134a21a..8a71bb7 100644 --- a/libopie2/opiepim/backend/otodoaccessxml.h +++ b/libopie2/opiepim/backend/otodoaccessxml.h @@ -52,7 +52,6 @@ public: QArray allRecords()const; QArray matchRegexp(const QRegExp &r) const; - QArray queryByExample( const OPimTodo&, int querysettings, const QDateTime& d = QDateTime() ); OPimTodo find( int uid )const; void clear(); bool add( const OPimTodo& ); -- cgit v0.9.0.2