Changeset 395

Timestamp:

06/15/09 17:56:35 (4 years ago)

Author:

henri

Message:

Phone numbers now properly compare if spaces, parens or dashes exist.

Location:

apps/iphone/superbook/trunk/Classes

Files:

• DotTelABMapper.h (modified) (1 diff)
• DotTelABMapper.m (modified) (2 diffs)

apps/iphone/superbook/trunk/Classes/DotTelABMapper.h

@@ -54 +54 @@
 - (NSError *)setField:(id)field;
 
+- (BOOL)record:(NSString *)aRec isEqualToRecord:(NSString *)otherRec forProperty:(ABPropertyID)property;
+- (BOOL)phone:(NSString *)aPhone isEqualToPhone:(NSString *)otherPhone;
+
 @end

apps/iphone/superbook/trunk/Classes/DotTelABMapper.m

@@ -49 +49 @@
                                                                                 CFStringRef aVal = (CFStringRef)ABMultiValueCopyValueAtIndex(allupdated, i); \
                                                                                 if (aVal) { \
-                                                                                        if (CFStringCompare(abValue, aVal, 0) == kCFCompareEqualTo) { \
+                                                                                        if ([self record:(NSString *)abValue isEqualToRecord:(NSString *)aVal forProperty:kValType]) { \
                                                                                                 exists = YES; \
                                                                                                 CFRelease(aVal); \
@@ -613 +613 @@
 }
 
+#pragma mark ---- utility methods ----
+
+- (BOOL)record:(NSString *)aRec isEqualToRecord:(NSString *)otherRec forProperty:(ABPropertyID)property {
+        if (property == kABPersonPhoneProperty)
+                return [self phone:aRec isEqualToPhone:aRec];
+        return [aRec isEqualToString:otherRec];
+}
+
+- (BOOL)phone:(NSString *)aPhone isEqualToPhone:(NSString *)otherPhone {
+        char *p1 = (char *)[aPhone cStringUsingEncoding:NSUTF8StringEncoding];
+        char *p2 = (char *)[otherPhone cStringUsingEncoding:NSUTF8StringEncoding];
+        BOOL areEqual = TRUE;
+        int i = 0;
+        int j = 0;
+        while ((char)p1[i] != '\0') {
+                if ((p1[i] == ' ') || (p1[i] == '-') || (p1[i] == '(') || (p1[i] == ')')) {
+                        i++;
+                        //NSLog(@"Skipped p1 char '%c' at index %d", p1[i], i);
+                        continue;
+                }
+                if (p2[j] == '\0') {
+                        //NSLog(@"End of p2 at %d, shorter than p1 at %d", j, i);
+                        areEqual = FALSE;
+                        break;
+                }
+                while (p2[j] != '\0') {
+                        if ((p2[j] == ' ') || (p2[j] == '-') || (p2[j] == '(') || (p2[j] == ')')) {
+                                //NSLog(@"Skipped p2 char '%c' at index %d", p2[j], i);
+                                j++;
+                                continue;
+                        }
+                        if(p1[i] != p2[j]) {
+                                areEqual = FALSE;
+                                //NSLog(@"Failed compare of p1[%d] '%c' and p2[%d] '%c'", i, p1[i], j, p2[j]);
+                                break;
+                        }
+                        //NSLog(@"Success compare of p1[%d] '%c' and p2[%d] '%c'", i, p1[i], j, p2[j]);
+                        i++;
+                        j++;
+                        break;
+                }
+                if (!areEqual)  // we already have a miss
+                        break;
+        }
+        if (areEqual) { // we are equal up to end of p1. Check that p2 isn't longer
+                while (p2[j] != '\0') {
+                        if ((p2[j] == ' ') || (p2[j] == '-') || (p2[j] == '(') || (p2[j] == ')')) {
+                                //NSLog(@"Skipped p2 char '%c' at index %d, after p1 end", p1[i], i);
+                                j++;
+                                continue;
+                        }
+                        //NSLog(@"Extra character(s) for p2 starting at index %d: '%c'", j, p2[j]);
+                        areEqual = FALSE;
+                        break;
+                }
+        }
+        return areEqual;
+}
+
 #pragma mark ---- cleanup ----