summaryrefslogtreecommitdiff
path: root/libopie/pim
Side-by-side diff
Diffstat (limited to 'libopie/pim') (more/less context) (show whitespace changes)
-rw-r--r--libopie/pim/ocontact.h4
-rw-r--r--libopie/pim/ocontactaccess.cpp8
-rw-r--r--libopie/pim/ocontactaccess.h8
-rw-r--r--libopie/pim/ocontactaccessbackend.h7
-rw-r--r--libopie/pim/ocontactaccessbackend_xml.h20
5 files changed, 43 insertions, 4 deletions
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index 382ab94..038a59f 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -107,11 +107,7 @@ public:
void setNotes( const QString &v ) { replace( Qtopia::Notes, v); }
bool match( const QString &regexp ) const;
-
-// DON'T ATTEMPT TO USE THIS
-#ifdef QTOPIA_INTERNAL_CONTACT_MRE
bool match( const QRegExp &regexp ) const;
-#endif
// // custom
// void setCustomField( const QString &key, const QString &v )
diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp
index 2ca0283..f868b53 100644
--- a/libopie/pim/ocontactaccess.cpp
+++ b/libopie/pim/ocontactaccess.cpp
@@ -21,6 +21,9 @@
* =====================================================================
* History:
* $Log$
+ * Revision 1.6 2002/11/01 15:10:42 eilers
+ * Added regExp-search in database for all fields in a contact.
+ *
* Revision 1.5 2002/10/16 10:52:40 eilers
* Added some docu to the interface and now using the cache infrastucture by zecke.. :)
*
@@ -120,6 +123,11 @@ bool OContactAccess::save ()
return true;
}
+ORecordList<OContact> OContactAccess::matchRegexp( const QRegExp &r ) const{
+ QArray<int> matchingContacts = m_backEnd -> matchRegexp( r );
+ return ( ORecordList<OContact>(matchingContacts, this) );
+}
+
const uint OContactAccess::querySettings()
{
return ( m_backEnd->querySettings() );
diff --git a/libopie/pim/ocontactaccess.h b/libopie/pim/ocontactaccess.h
index da9c942..b4921d5 100644
--- a/libopie/pim/ocontactaccess.h
+++ b/libopie/pim/ocontactaccess.h
@@ -17,6 +17,9 @@
* =====================================================================
* History:
* $Log$
+ * Revision 1.4 2002/11/01 15:10:42 eilers
+ * Added regExp-search in database for all fields in a contact.
+ *
* Revision 1.3 2002/10/16 10:52:40 eilers
* Added some docu to the interface and now using the cache infrastucture by zecke.. :)
*
@@ -48,6 +51,7 @@
/** Class to access the contacts database.
* This is just a frontend for the real database handling which is
* done by the backend.
+ * @see OPimAccessTemplate
*/
class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
{
@@ -81,8 +85,12 @@ class OContactAccess: public QObject, public OPimAccessTemplate<OContact>
IgnoreCase = 0x0002,
RegExp = 0x0004,
ExactMatch = 0x0008,
+ MatchOne = 0x0010 // Only one Entry must match
};
+
+ ORecordList<OContact> matchRegexp( const QRegExp &r )const;
+
/** Return all possible settings.
* @return All settings provided by the current backend
* (i.e.: query_WildCards & query_IgnoreCase)
diff --git a/libopie/pim/ocontactaccessbackend.h b/libopie/pim/ocontactaccessbackend.h
index a651477..c898f61 100644
--- a/libopie/pim/ocontactaccessbackend.h
+++ b/libopie/pim/ocontactaccessbackend.h
@@ -19,6 +19,9 @@
* =====================================================================
* History:
* $Log$
+ * Revision 1.3 2002/11/01 15:10:42 eilers
+ * Added regExp-search in database for all fields in a contact.
+ *
* Revision 1.2 2002/10/07 17:34:24 eilers
* added OBackendFactory for advanced backend access
*
@@ -38,6 +41,8 @@
#include "ocontact.h"
#include "opimaccessbackend.h"
+#include "qregexp.h"
+
class OContactAccessBackend: public OPimAccessBackend<OContact> {
public:
OContactAccessBackend() {}
@@ -58,6 +63,8 @@ class OContactAccessBackend: public OPimAccessBackend<OContact> {
*/
virtual bool wasChangedExternally() = 0;
+ virtual QArray<int> matchRegexp( const QRegExp &r ) const = 0;
+
/** Return all possible settings.
* @return All settings provided by the current backend
* (i.e.: query_WildCards & query_IgnoreCase)
diff --git a/libopie/pim/ocontactaccessbackend_xml.h b/libopie/pim/ocontactaccessbackend_xml.h
index 12a75ba..f7e8207 100644
--- a/libopie/pim/ocontactaccessbackend_xml.h
+++ b/libopie/pim/ocontactaccessbackend_xml.h
@@ -17,6 +17,9 @@
* =====================================================================
* History:
* $Log$
+ * Revision 1.5 2002/11/01 15:10:42 eilers
+ * Added regExp-search in database for all fields in a contact.
+ *
* Revision 1.4 2002/10/16 10:52:40 eilers
* Added some docu to the interface and now using the cache infrastucture by zecke.. :)
*
@@ -255,6 +258,23 @@ class OContactAccessBackend_XML : public OContactAccessBackend {
return m_currentQuery;
}
+ QArray<int> matchRegexp( const QRegExp &r ) const{
+ QArray<int> m_currentQuery( m_contactList.count() );
+ QValueListConstIterator<OContact> it;
+ uint arraycounter = 0;
+
+ for( it = m_contactList.begin(); it != m_contactList.end(); ++it ){
+ if ( (*it).match( r ) ){
+ m_currentQuery[arraycounter++] = (*it).uid();
+ }
+
+ }
+ // Shrink to fit..
+ m_currentQuery.resize(arraycounter);
+
+ return m_currentQuery;
+ }
+
const uint querySettings()
{
return ( OContactAccess::WildCards