fix(addressbook(dav)): improve handling of addressbook-query

Alinto · Mar 9, 2022 · 1545bcd · 1545bcd
1 parent a965f27
commit 1545bcd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SOPE/GDLContentStore/EOQualifier+GCS.m b/SOPE/GDLContentStore/EOQualifier+GCS.m
@@ -136,7 +136,7 @@ - (void) _appendKeyValueQualifier: (EOKeyValueQualifier *) _q
         {
           if (_adaptor)
             {
-              // Assume qualifier applies to a varchar column type
+              // The value is a string, assume qualifier applies to a varchar column type
               attribute = [EOAttribute new];
               [attribute setExternalType: @"varchar"];
               [attribute autorelease];

diff --git a/SoObjects/Contacts/SOGoContactGCSFolder.m b/SoObjects/Contacts/SOGoContactGCSFolder.m
@@ -221,9 +221,9 @@ - (EOQualifier *) qualifierForFilter: (NSString *) filter
   qualifier = nil;
   if ([filter length] > 0)
     {
-      filter = [filter asSafeSQLLikeString];
+      filter = [[filter asSafeSQLString] stringByReplacingString: @"\%" withString: @"%%"];
       filters = [NSMutableArray array];
-      filterFormat = [NSString stringWithFormat: @"(%%@ isCaseInsensitiveLike: '%%%%%@%%%%')", filter];
+      filterFormat = [NSString stringWithFormat: @"(%%@ isCaseInsensitiveLike: '*%@*')", filter];
       if (criteria)
         criteriaList = [criteria objectEnumerator];
       else