* Make improved query by example accessable via frontend

	* Some API improvement

4 files changed, 74 insertions, 9 deletions

diff --git a/libopie2/opiepim/ChangeLog b/libopie2/opiepim/ChangeLog
index dd57259..564e92a 100644
--- a/libopie2/opiepim/ChangeLog
+++ b/libopie2/opiepim/ChangeLog
@@ -1,18 +1,21 @@
+2004-12-28  Stefan Eilers <stefan@eilers-online.net>
+        * Make improved query by example accessable via frontend
+        * Some API improvement
 2004-11-23  Stefan Eilers <stefan@eilers-online.net>
         * Implement fast and full featured version of sorted() for addressbook
         * Implement generic queryByExample for all Addressboook backends. It allows incremental search.
         * Update of API Documentation
 2004-11-18  Holger Freyther  <freyther@handhelds.org>
         * Every Access can give a set of Occurrences for a period or a datetime
         * QueryByExample, Find, Sort can be generically accessed by OPimBase 
           pointer interface
         * OPimBackendOccurrence gets split up to OPimOccurrences by 
           OPimTemplateBase
         * Add safeCast to various OPimRecords
         * Kill memleak in OPimTodo
         * Add SortVector implementations for OPimTodo and OPimContact
         
         2004-??-??The Opie Team <opie@handhelds.org>
         * Implemented some important modifications to allow to use OPimRecords as it is, without
           have to cast them. This makes it possible to write applications which handling pim
           data in a generic manner (see opimconvertion tool) (eilers)
\ No newline at end of file
diff --git a/libopie2/opiepim/core/ocontactaccess.h b/libopie2/opiepim/core/ocontactaccess.h
index bd85b4e..5051321 100644
--- a/libopie2/opiepim/core/ocontactaccess.h
+++ b/libopie2/opiepim/core/ocontactaccess.h
@@ -91,65 +91,65 @@ class OPimContactAccess: public QObject, public OPimAccessTemplate<OPimContact>
         SortSuffix,
         SortEmail,
         SortNickname,
         SortFileAsName,
         SortAnniversary,
         SortBirthday,
         SortGender
     };
 
         /**
          * Create Database with contacts (addressbook).
          * @param appname Name of application which wants access to the database
          * (i.e. "todolist")
          * @param filename The name of the database file. If not set, the default one
          * is used.
          * @param backend Pointer to an alternative Backend. If not set, we will use
          * the default backend.
          * @param handlesync If <b>true</b> the database stores the current state
          * automatically if it receives the signals <i>flush()</i> and <i>reload()</i>
          * which are used before and after synchronisation. If the application wants
          * to react itself, it should be disabled by setting it to <b>false</b>
          * @see OPimContactAccessBackend
          */
         OPimContactAccess (const QString appname, const QString filename = 0l,
                            OPimContactAccessBackend* backend = 0l, bool handlesync = true);
         ~OPimContactAccess ();
 
 
         /** 
          * Return all possible settings for queryByExample().
          *  @return All settings provided by the current backend
          * (i.e.: WildCards & IgnoreCase)
-         * @see QuerySettings in OPimBase for details of the parameter
+         * @see QuerySettings in OPimBase for details of the parameter, queryByExample()
          */
         const uint querySettings();
 
         /** 
          * Check whether settings are correct for queryByExample().
          * @return <i>true</i> if the given settings are correct and possible.
          * @see QuerySettings in OPimBase for details of the parameter
          */
         bool hasQuerySettings ( int querySettings ) const;
 
         /**
          * if the resource was changed externally.
          * You should use the signal instead of polling possible changes !
          */
         bool wasChangedExternally()const;
 
 
         /** Save contacts database.
          * Save is more a "commit". After calling this function, all changes are public available.
          * @return true if successful
          */
         bool save();
 
         /**
          * Return identification of used records
          */
         int rtti() const;
 
  signals:
         /* Signal is emitted if the database was changed. Therefore
          * we may need to reload to stay consistent.
          * @param which Pointer to the database who created this event. This pointer
diff --git a/libopie2/opiepim/core/opimaccesstemplate.h b/libopie2/opiepim/core/opimaccesstemplate.h
index 073d5f9..3875f09 100644
--- a/libopie2/opiepim/core/opimaccesstemplate.h
+++ b/libopie2/opiepim/core/opimaccesstemplate.h
@@ -57,65 +57,105 @@ class OPimAccessTemplatePrivate;
 template <class T = OPimRecord >
 class OPimAccessTemplate : public OTemplateBase<T> {
 public:
     /**
      *
      */
     enum Access {
         Random = 0,
         SortedAccess
     };
     typedef OPimRecordList<T> List;
     typedef OPimAccessBackend<T> BackEnd;
     typedef OPimCache<T> Cache;
 
     //@{
     OPimAccessTemplate( BackEnd* end);
     virtual ~OPimAccessTemplate();
     //@}
 
     //@{
     bool load();
     virtual bool reload();
     bool save();
     void clear() ;
     //@}
 
 
     bool wasChangedExternally()const;
 
     //@{
     virtual List allRecords()const;
     virtual List matchRegexp(  const QRegExp &r ) const;
-    virtual List queryByExample( const T& t, int querySettings, const QDateTime& d = QDateTime() );
+
+    /**
+     * Query by example search interface. 
+     * "Query by Example" provides a very powerful search engine. Use the query object 
+     * (this may be a contact, a todo or databook event) 
+     * as a search mask which is converted into a query regarding the querySettings. If a time period is needed 
+     * (as for OpimBase::DateDiff), you have to use the date/time in the query object and the endperiod (the last parameter).
+     * @see QuerySettings in class OPimBase 
+     * @param query The object which contains the query set
+     * @param querySettings This parameter defines what should be searched and how the query should be interpreted
+     * @param endperiod Defines the end of a period for some special queries.    
+     */
+    virtual List queryByExample( const T& query, int querySettings, const QDateTime& endperiod = QDateTime() );
+
+    /**
+     * Generic query by example search interface. This is a special version which handles generic OPimRecord types. They are converted 
+     * automatically into the right datatype.
+     * "Query by Example" provides a very powerful search engine. Use the query object (this may be a contact, a todo or databook event) 
+     * as a search mask which is converted into a query regarding the querySettings. If a time period is needed 
+     * (as for OpimBase::DateDiff), you have to use the date/time in the query object and the endperiod (the last parameter).
+     * @see QuerySettings in class OPimBase 
+     * @param query The object which contains the query set
+     * @param querySettings This parameter defines what should be searched and how the query should be interpreted
+     * @param endperiod Defines the end of a period for some special queries.    
+     */
+    virtual List queryByExample( const OPimRecord* query, int querySettings, const QDateTime& endperiod = QDateTime() );
+    /**
+     * Incremental query by example search interface. Providing incremental search, this one provides the feature 
+     * to search in a list of records which may be returned by an other search.
+     * "Query by Example" provides a very powerful search engine. Use the query object (this may be a contact, a todo or databook event) 
+     * as a search mask which is converted into a query regarding the querySettings. If a time period is needed 
+     * (as for OpimBase::DateDiff), you have to use the date/time in the query object and the endperiod (the last parameter).
+     * @see QuerySettings in class OPimBase 
+     * @param uidlist List of uid's which should be incorporated into the next search 
+     * @param query The object which contains the query set
+     * @param querySettings This parameter defines what should be searched and how the query should be interpreted
+     * @param endperiod Defines the end of a period for some special queries.    
+     */
+    virtual List queryByExample( const OPimAccessTemplate::List& uidlist, const T& query, int querySettings, 
+                                 const QDateTime& endperiod = QDateTime() );
+
     virtual T find( UID uid )const;
     virtual T find( UID uid, const QArray<int>&,
                     uint current, typename OTemplateBase<T>::CacheDirection dir = OTemplateBase<T>::Forward )const;
     //@}
 
     /** 
      * Get sorted lists..
      * @see OPimContactAccess, OPimTodoAccess and ODateBookAccess regarding more info for the following params:
      * @param list of UID's received by allRecords() or others...
      * @param sortOrder Setting the sort order defined by enum SortOrder
      * @param ascending Sort in ascending order if true, otherwise descending
      * @param sortFilter Setting the sort filter defined by enum SortFilter
      * @param cat number of category.
      */
     virtual List sorted( const List& list, bool ascending, int sortOrder,
                          int sortFilter, int cat )const;
 
     /** 
      * Get sorted lists..
      * @see OPimContactAccess, OPimTodoAccess and ODateBookAccess regarding more info for the following params:
      * @param list of UID's received by allRecords() or others...
      * @param sortOrder Setting the sort order defined by enum SortOrder
      * @param ascending Sort in ascending order if true, otherwise descending
      * @param sortFilter Setting the sort filter defined by enum SortFilter
      * @param cats List of categories.
      */
     virtual List sorted( const List& list, bool ascending, int sortOrder,
                          int sortFilter, const QArray<UID>& cats )const;
 
     /** 
      * Get sorted lists..
      * @see OPimContactAccess, OPimTodoAccess and ODateBookAccess regarding more info for the following params:
@@ -240,78 +280,100 @@ bool OPimAccessTemplate<T>::save() {
 
 /**
  * return a List of records
  * you can iterate over them
  */
 template <class T>
 typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::allRecords()const {
     QArray<int> ints = m_backEnd->allRecords();
     List lis(ints, this );
     return lis;
 }
 
 /**
  * return a List of records
  * that match the regex
  */
 template <class T>
 typename OPimAccessTemplate<T>::List OPimAccessTemplate<T>::matchRegexp( const QRegExp &r )const {
     QArray<int> ints = m_backEnd->matchRegexp( r );
     List lis(ints, this );
     return lis;
 }
 
 /**
  * find the OPimRecord uid
  */
 template <class T>
 QArray<int> OPimAccessTemplate<T>::records()const {
     return m_backEnd->allRecords();
 }
 
 
-/**
- * queryByExample.
- * @see otodoaccess, ocontactaccess
- */
 template <class T>
 typename OPimAccessTemplate<T>::List
 OPimAccessTemplate<T>::queryByExample( const T& t, int settings, const QDateTime& d ) {
     QArray<int> ints = m_backEnd->queryByExample( t, settings, d );
 
-    List lis(ints, this );
-    return lis;
+    List list(ints, this );
+    return list;
 }
 
 template <class T>
+typename OPimAccessTemplate<T>::List
+OPimAccessTemplate<T>::queryByExample( const OPimRecord* t, int settings, const QDateTime& d ) {
+    T tempInstance;
+
+    if ( t->rtti() == tempInstance.rtti() ) {
+            QArray<int> ints = m_backEnd->queryByExample( t, settings, d );
+            List list( ints, this );
+            return list;
+    } else {
+        owarn << "Query not possible: Objecttype mismatch" << oendl;
+    } 
+
+    return List();
+}
+
+template <class T>
+typename OPimAccessTemplate<T>::List
+OPimAccessTemplate<T>::queryByExample( const OPimAccessTemplate::List& uidlist, const T& t, int settings, const QDateTime& d ) {
+    QArray<int> ints = m_backEnd->queryByExample( uidlist.uids(), t, settings, d );
+
+    List list( ints, this );
+    return list;
+}
+
+
+template <class T>
 T OPimAccessTemplate<T>::find( UID uid ) const{
     // First search in cache..
     if ( m_cache.contains( uid ) )
             return m_cache.find( uid );
 
     T t = m_backEnd->find( uid );
     cache( t );
 
     return t;
 }
 
 
 /**
  * read ahead cache find method ;)
  */
 template <class T>
 T OPimAccessTemplate<T>::find( UID uid, const QArray<int>& ar,
                                uint current, typename OTemplateBase<T>::CacheDirection dir )const {
     /*
      * better do T.isEmpty()
      * after a find this way we would
      * avoid two finds in QCache...
      */
     if (m_cache.contains( uid ) )
         return m_cache.find( uid );
 
 
     T t = m_backEnd->find( uid, ar, current, dir );
     cache( t );
     return t;
 }
 
diff --git a/libopie2/opiepim/core/opimtemplatebase.h b/libopie2/opiepim/core/opimtemplatebase.h
index c8abab4..075e573 100644
--- a/libopie2/opiepim/core/opimtemplatebase.h
+++ b/libopie2/opiepim/core/opimtemplatebase.h
@@ -105,65 +105,65 @@ struct OPimBase {
         /** The month matches */
         DateMonth  = 0x0080, 
         /** The day matches */
         DateDay    = 0x0100, 
         /** The last possible name matches */
         LastItem   = 0xffff  
     };
 
     /**
      * Common Attributes for the Sort Order
      */
     enum SortOrderBase {
         /** Sort by a Summary of the records */
         SortSummary = 0,
         /** Sort by Category */
         SortByCategory = 1,
         /** Sort by Date */
         SortByDate = 2, 
         /** The First available sort number for the OPimAccessTemplates */
         SortCustom  = 10,
         /** make this enum 16bit large */
         LastSortOrderBase = 0xffff 
     };
 
     /**
      * Sort a list of Items with the help of the sorted() function.
      * The Item you provide in SortOrder will be used
      * for sorting.
      *
      * @see OPimAccessTemplate<>::sorted()
      */
     enum SortFilterBase {
-            /** Do not filter anything. */
+        /** Do not filter anything. */
         FilterOff = 0,
         /** Use given Categories for filter */
         FilterCategory = 1,
         /** The first available custom filter defined in the specialized frontends */
         FilterCustom = 1024, 
         LastSortFilterBase = 0xffffffff
     };
 
     virtual UIDArray matchRegexpSimple( const QRegExp& r )const = 0;
     virtual UIDArray queryByExampleSimple( const OPimRecord*, int settings,
                                            const QDateTime& d = QDateTime() )const  = 0;
     virtual UIDArray sortedSimple( const UIDArray& uid, bool ascending,
                                    int sortOrder, int sortFilter, int cat)const = 0;
     virtual UIDArray sortedSimple( const UIDArray& uid, bool ascending,
                                    int sortOrder, int sortFilter, const QArray<UID>& cats )const = 0;
     virtual UIDArray sortedSimple( bool ascending, int sortOrder, int sortFilter, int cat)const = 0;
     virtual UIDArray sortedSimple( bool ascending, int sortOrder, int sortFilter, const QArray<UID>& cats )const = 0;
     virtual OPimOccurrence::List occurrences( const QDate& start,  const QDate& end )const = 0;
     virtual OPimOccurrence::List occurrences( const QDateTime& dt )const = 0;
     //@}
 
 
 protected:
     OPimOccurrence::List convertOccurrenceFromBackend( const OPimBackendOccurrence::List& )const;
 
 private:
     OPimBasePrivate* d;
 };
 
 
 /**
  * internal template base