FCL/sf/mw/qtextensions: comparison qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 * All the other filtering flags fallback to the generic filtering done
 * in QContactManagerEngine (expected to be done by to the caller). Contacts
 * are sorted only if the sort order is supported by contacts database. See
 * CntSymbianSorterDbms::filterSupportLevel for the list of supported sort
 * orders.
+*
+* Using detail filter with match flag MatchPhoneNumber is implemented by the
+* contact model "phone number match" that filters by comparing the search
+* string characters (digits) starting from the rightmost digit. The detail
+* filter value must be at least 7 digits, otherwise an error code
+* NotSupportedError is given. The actual digit count that is used is 7 to 15
+* digits, depending on the configuration of the device.
 *
 * \a filter The QContactFilter to be used.
 * \a sortOrders The sort orders to be used. If the sort orders are not
 * supported by contacts database this parameter is ignored and sorting needs
 * to be done by the caller.
 */
 QList<QContactLocalId> CntSymbianFilter::contacts(
 const QContactFilter &filter,
 const QList<QContactSortOrder> &sortOrders,
 bool &filterSupportedFlag,
-QContactManager::Error &error)
+QContactManager::Error* error)
 {
 QList<QContactLocalId> result;
 // No need to proceed if some of the filters in the chain is not supported
 if(!filterSupportedFlag) return result;
 // an intersection filter
 } else if (filter.type() == QContactFilter::ContactDetailFilter
 && (static_cast<const QContactDetailFilter &>(filter)).value().type() == QVariant::StringList) {
 QStringList values = (static_cast<const QContactDetailFilter &>(filter)).value().toStringList();
 QContactIntersectionFilter intersectionFilter;
-foreach(QString value, values) {
+foreach(const QString& value, values) {
 QContactDetailFilter detailFilter = filter;
 detailFilter.setValue(value);
 intersectionFilter.append(detailFilter);
 }
 // The resulting filter is handled with a recursive function call
 result = contacts(intersectionFilter, sortOrders, filterSupportedFlag, error);
 } else {
-if (filterSupportLevel(filter) == Supported) {
+FilterSupport filterSupport = filterSupportLevel(filter);
+if (filterSupport == Supported) {
 filterSupportedFlag = true;
 // Filter supported, use as the result directly
 result = filterContacts(filter, error);
-} else if (filterSupportLevel(filter) == SupportedPreFilterOnly) {
+} else if (filterSupport == SupportedPreFilterOnly) {
 // Filter only does pre-filtering, the caller is responsible of
 // removing possible false positives after filtering
 filterSupportedFlag = false;
 result = filterContacts(filter, error);
+} else if (filterSupport == IllegalFilter) {
+// Don't do filtering; fail with an error
+filterSupportedFlag = false;
+*error = QContactManager::NotSupportedError;
 } else {
 // Don't do filtering here, return all contact ids and tell the
 // caller to do slow filtering
 filterSupportedFlag = false;
 result = filterContacts(QContactInvalidFilter(), error);
 // Phone numbers
 if (defName == QContactPhoneNumber::DefinitionName) {
 if (matchFlags == QContactFilter::MatchPhoneNumber) {
-return Supported;
+if (detailFilter.value().canConvert(QVariant::String)) {
-}
+if (detailFilter.value().toString().length() >= 7) {
+return Supported;
-if (matchFlags == QContactFilter::MatchExactly ||
+} else {
-matchFlags == QContactFilter::MatchEndsWith ||
+// It is a feature of Symbian contact model that phone
-matchFlags == QContactFilter::MatchFixedString) {
+// number match requires at least 7 digits. In case of
-return SupportedPreFilterOnly;
+// phone number match it is best to give an error as a
+// result because the phone number match logic would
+// not be much of use with less than 7 digit matching.
+// It would give false positives too often.
+return IllegalFilter;
+}
+}
+} else if (matchFlags == QContactFilter::MatchExactly
+|| matchFlags == QContactFilter::MatchEndsWith
+|| matchFlags == QContactFilter::MatchFixedString) {
+if (detailFilter.value().canConvert(QVariant::String)) {
+// It is a feature of Symbian contact model that phone
+// number match requires at least 7 digits
+if (detailFilter.value().toString().length() >= 7) {
+return SupportedPreFilterOnly;
+}
+}
 }
 // Names
 } else if (defName == QContactName::DefinitionName
 || defName == QContactNickname::DefinitionName
 || defName == QContactEmailAddress::DefinitionName) {
 return NotSupported;
 }
 QList<QContactLocalId> CntSymbianFilter::filterContacts(
 const QContactFilter& filter,
-QContactManager::Error& error)
+QContactManager::Error* error)
 {
 QList<QContactLocalId> matches;
 CContactIdArray* idArray(0);
-if (filter.type() == QContactFilter::InvalidFilter ){
+if (filter.type() == QContactFilter::InvalidFilter) {
 TTime epoch(0);
 idArray = m_contactDatabase.ContactsChangedSinceL(epoch); // return all contacts
 } else if(filterSupportLevel(filter) == NotSupported) {
-error = QContactManager::NotSupportedError;
+*error = QContactManager::NotSupportedError;
 } else if (filter.type() == QContactFilter::ContactDetailFilter) {
 const QContactDetailFilter &detailFilter = static_cast<const QContactDetailFilter &>(filter);
 // Phone numbers
 if (detailFilter.detailDefinitionName() == QContactPhoneNumber::DefinitionName) {
 // for filtering with display label
 if (detailFilter.detailDefinitionName() == QContactDisplayLabel::DefinitionName
 && detailFilter.matchFlags() == QContactFilter::MatchStartsWith) {
 // Remove false positives
-for(TInt i(0); i < idArray->Count(); i++) {
+for(TInt i(0); i < idArray->Count(); ++i) {
 CContactItem* contactItem = m_contactDatabase.ReadContactLC((*idArray)[i]);
 const CContactItemFieldSet& fieldSet(contactItem->CardFields());
 if(isFalsePositive(fieldSet, KUidContactFieldGivenName, namePtr)
 && isFalsePositive(fieldSet, KUidContactFieldFamilyName, namePtr)
 && isFalsePositive(fieldSet, KUidContactFieldCompanyName, namePtr)
 }
 delete fieldDef;
 }
 }
-if(idArray && (error == QContactManager::NoError)) {
+if(idArray && (*error == QContactManager::NoError)) {
 // copy the matching contact ids
 for(int i(0); i < idArray->Count(); i++) {
 matches.append(QContactLocalId((*idArray)[i]));
 }
 }
 TPtrC text = storage->Text();
 index = text.FindC(searchString);
 // Check if this is the first word beginning with search string
 if(index == 0)
 value = false;
-// Check if this is in the beginning of a word (the preceeding
+// Check if this is in the beginning of a word (the preceding
 // character is a space)
 else if(index > 0 && TChar(text[index-1]) == TChar(0x20))
 value = false;
 }
 return value;
 // TODO: Refactor to use the transform classes
 // Names
 if(detailFilter.detailDefinitionName() == QContactName::DefinitionName) {
 if(detailFilter.detailFieldName() == QContactName::FieldPrefix) {
 tempFieldDef->AppendL(KUidContactFieldPrefixName);
-} else if(detailFilter.detailFieldName() == QContactName::FieldFirst) {
+} else if(detailFilter.detailFieldName() == QContactName::FieldFirstName) {
 tempFieldDef->AppendL(KUidContactFieldGivenName);
-} else if(detailFilter.detailFieldName() == QContactName::FieldMiddle) {
+} else if(detailFilter.detailFieldName() == QContactName::FieldMiddleName) {
 tempFieldDef->AppendL(KUidContactFieldAdditionalName);
-} else if(detailFilter.detailFieldName() == QContactName::FieldLast) {
+} else if(detailFilter.detailFieldName() == QContactName::FieldLastName) {
 tempFieldDef->AppendL(KUidContactFieldFamilyName);
 } else if(detailFilter.detailFieldName() == QContactName::FieldSuffix) {
 tempFieldDef->AppendL(KUidContactFieldSuffixName);
 } else {
 // default to all name fields

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 8	71781823f776