Revert "Remove listRequiresDot option from *Source classes"

This reverts commit 6b2ec7a2e7.
2026-06-03 17:39:45 +00:00 · 2016-05-17 13:41:33 -04:00
parent 9ddc5eb49b
commit e3c7bdd5d8
5 changed files with 77 additions and 28 deletions
@@ -353,15 +353,26 @@
  NSArray *records, *result;
  EOSortOrdering *ordering;

-  records = [source fetchContactsMatching: filter inDomain: domain];
-  [childRecords setObjects: records forKeys: [records objectsForKey: @"c_name"
-                                                     notFoundMarker: nil]];
-  records = [self _flattenedRecords: records];
-  ordering = [EOSortOrdering sortOrderingWithKey: sortKey
-                             selector: ((sortOrdering == NSOrderedDescending)
-                                        ? EOCompareCaseInsensitiveDescending
-                                        : EOCompareCaseInsensitiveAscending)];
-  result = [records sortedArrayUsingKeyOrderArray: [NSArray arrayWithObject: ordering]];
+  result = nil;
+
+  if (([filter length] > 0 && [criteria isEqualToString: @"name_or_address"])
+      || ![source listRequiresDot])
+    {
+      records = [source fetchContactsMatching: filter
+                                     inDomain: domain];
+      [childRecords setObjects: records
+                       forKeys: [records objectsForKey: @"c_name"
+                                        notFoundMarker: nil]];
+      records = [self _flattenedRecords: records];
+      ordering
+        = [EOSortOrdering sortOrderingWithKey: sortKey
+                          selector: ((sortOrdering == NSOrderedDescending)
+                                     ? EOCompareCaseInsensitiveDescending
+                                     : EOCompareCaseInsensitiveAscending)];
+      result
+        = [records sortedArrayUsingKeyOrderArray:
+                     [NSArray arrayWithObject: ordering]];
+    }

  return result;
 }