Changeset 382 for apps/iphone/superbook/trunk/DotTel_SDK/Classes

Timestamp:

06/07/09 11:21:46 (4 years ago)

Author:

henri

Message:

Major update: save .tel data to AddressBook?, with many other small fixes

Location:

apps/iphone/superbook/trunk/DotTel_SDK/Classes

Files:

• DnsResolver.m (modified) (1 diff)
• RecordNaptr.h (modified) (1 diff)
• RecordNaptr.m (modified) (2 diffs)
• RecordTxt.h (modified) (2 diffs)
• RecordTxt.m (modified) (6 diffs)

apps/iphone/superbook/trunk/DotTel_SDK/Classes/DnsResolver.m

@@ -245 +245 @@
                         }
                         @catch (NSException * e) {
-                                dict = [NSDictionary dictionaryWithObject:@"Network Error: Bad data returned" forKey:NSLocalizedDescriptionKey];
-                                err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_BAD_DATA userInfo:dict];
-                                if (error)
-                                        *error = err2;
+                                // Exception is caught if there's no data in the rrlist,
+                                // i.e. if there are no records. That's BAD.
+                                // TODO: See in ldns rr.c source why ldns_rr_list_rr_count() fails and doesn't return 0
+                                // In the meantime, disable the error
+                                
+//                              dict = [NSDictionary dictionaryWithObject:@"Network Error: Bad data returned" forKey:NSLocalizedDescriptionKey];
+//                              err2 = [NSError errorWithDomain:@"org.telnic.tel.sdk" code:RESOLVER_STATUS_BAD_DATA userInfo:dict];
+//                              if (error)
+//                                      *error = err2;
                                 rrlist = NULL;
                         }

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordNaptr.h

@@ -104 +104 @@
 @property (readonly) BOOL isValid;
 
+@property (readonly, nonatomic, retain) NSMutableArray *serviceTypeArray;
+@property (readonly, nonatomic, retain) NSMutableArray *labelArray;
+@property (readonly, nonatomic, retain) NSMutableArray *lihArray;
+
 @property (readonly, nonatomic, retain) NSNumber *order; 
 @property (readonly, nonatomic, retain) NSNumber *preference; 

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordNaptr.m

@@ -45 +45 @@
 @implementation RecordNaptr
 
+@synthesize serviceTypeArray;
+@synthesize labelArray;
+@synthesize lihArray;
+
 @synthesize order;
 @synthesize preference;
@@ -95 +99 @@
         expiryDate = [lookupDate addTimeInterval:ttl];
         
-        serviceTypeArray = [NSMutableArray arrayWithCapacity:2];
-        labelArray = [NSMutableArray arrayWithCapacity:2];
-        lihArray = [NSMutableArray arrayWithCapacity:2];
+        serviceTypeArray = [[NSMutableArray arrayWithCapacity:2] retain];
+        labelArray = [[NSMutableArray arrayWithCapacity:2] retain];
+        lihArray = [[NSMutableArray arrayWithCapacity:2] retain];
         
         order = [[self numberFromIntRdf:ldns_rr_rdf(rr,0)] retain];

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordTxt.h

@@ -42 +42 @@
         
         // Derived attributes
-        NSString *typeDescription;                      // keyword type(s) string
+        NSString *primaryDescription;           // primary keyword type description (nl, pa, ...)
+        NSString *primaryValue;                         // primary keyword value
         NSString *textValue;                            // string value of the TXT record
+        NSMutableArray *keysAndValues;          // all keys and values of the TXT record (including primary key/value)
         NSDate *expiryDate;                                     // Expiry date of the record, based on time-to-live
 
@@ -80 +82 @@
 @property (readonly) BOOL isSystemMessage;
 
-@property (readonly, nonatomic, retain) NSString *typeDescription;
+@property (readonly, nonatomic, retain) NSString *primaryDescription;
+@property (readonly, nonatomic, retain) NSString *primaryValue;
 @property (readonly, nonatomic, retain) NSString *textValue;
+@property (readonly, nonatomic, retain) NSMutableArray *keysAndValues;
 @property (readonly, nonatomic, retain) NSDate *expiryDate;
 

apps/iphone/superbook/trunk/DotTel_SDK/Classes/RecordTxt.m

@@ -29 +29 @@
 #import "RecordTxt.h"
 
+static NSCharacterSet *trimCharacterSet;
+
 @interface RecordTxt (PrivateMethods)
 
@@ -45 +47 @@
 @synthesize expiryDate;
 
-@synthesize typeDescription;
+@synthesize primaryDescription;
+@synthesize primaryValue;
 @synthesize textValue;
+@synthesize keysAndValues;
 
 + (id)recordWithRr:(ldns_rr *)rr {
@@ -69 +73 @@
 - (id)initWithRr:(ldns_rr *)rr date:(NSDate *)lookupDate {
         self = [super init];
+        trimCharacterSet = [[NSCharacterSet whitespaceCharacterSet] retain];
         isValid = NO;
-        
+        isKeyword = NO;
+
         if (ldns_rr_get_type(rr) != LDNS_RR_TYPE_TXT)
                 return self;
@@ -80 +86 @@
         if ([firstString isEqualToString:@".tkw"]) {
                 // parse keywords
+                isKeyword = YES;
                 isValid = [self parseKeywordsFromRecord:rr];
         } else if ([firstString isEqualToString:@".tsm"]) {
                 // system message, do nothing
                 return self;
+        } else if ([firstString isEqualToString:@".tad"]) {
+                // advert, do nothing for now
+                return self;
         } else {
                 // header
                 isHeader = YES;
-                typeDescription= [@"" retain];
+                primaryDescription = [@"" retain];
+                primaryValue = NULL;
                 // Could have multiple strings in one record, they need to be joined together
                 NSMutableArray *stringComponents = [NSMutableArray arrayWithCapacity:2];
-                // TODO: concatenate all the strings in that rr
                 for (NSUInteger i=0; i < ldns_rr_rd_count(rr); i++) {
                         [stringComponents addObject:[self stringFromStringRdf:ldns_rr_rdf(rr,i)]];
                 }
 
-                textValue = [stringComponents componentsJoinedByString:@", "];
+                textValue = [stringComponents componentsJoinedByString:@" "];
                 isValid = YES;
         }
@@ -108 +118 @@
         // will have more. Here we opt to concatenate all the values for these compound keywords
         // and only keep the first type string, discarding all other type strings if they exist
+        // However, we also keep a full array of type+value in case the user wants to store that
+        // info into the address book.
         
         // Check version
         if ([[self stringFromStringRdf:ldns_rr_rdf(rr,1)] isEqualToString:@"1"]) {
                 // Version 1
-                typeDescription = [LocTelStr([self stringFromStringRdf:ldns_rr_rdf(rr,2)]) retain];
-                NSMutableArray *keyValueComponents = [NSMutableArray arrayWithCapacity:2];
-                for (NSUInteger i=3; i < ldns_rr_rd_count(rr); i=i+2) {
-                        [keyValueComponents addObject:[self stringFromStringRdf:ldns_rr_rdf(rr,i)]];
+                keysAndValues = [[NSMutableArray arrayWithCapacity:ldns_rr_rd_count(rr)] retain];
+                for (NSUInteger i=2; i < ldns_rr_rd_count(rr); i=i+2) {
+                        [keysAndValues addObject:[self stringFromStringRdf:ldns_rr_rdf(rr,i)]];
+                        [keysAndValues addObject:[self stringFromStringRdf:ldns_rr_rdf(rr,i+1)]];
                 }
-                textValue = [[keyValueComponents componentsJoinedByString:@" "] retain];
+                primaryDescription = [LocTelStr([keysAndValues objectAtIndex:0]) retain];
+                if ([keysAndValues count] < 3) {        // Only a single primary keyword/value
+                        primaryValue = NULL;
+                        textValue = [keysAndValues objectAtIndex:1];
+                } else {
+                        primaryValue = [keysAndValues objectAtIndex:1];
+                        NSMutableArray *keyValueComponents = [NSMutableArray arrayWithCapacity:2];
+                        for (NSUInteger i=1; i < [keysAndValues count]; i=i+2) {
+                                [keyValueComponents addObject:[keysAndValues objectAtIndex:i]];
+                        }
+                        textValue = [[[keyValueComponents componentsJoinedByString:@" "]
+                                                  stringByTrimmingCharactersInSet:trimCharacterSet] retain];
+                }
                 return TRUE;
         } else {
@@ -137 +161 @@
 }
 
+#pragma mark ---- cleanup ----
+
+- (void)dealloc {
+        [trimCharacterSet release];
+        [super dealloc];
+}
 
 @end