@@ -121,6 +121,7 @@ } - (void)addWordToDictionary:(NSMutableDictionary *)words word:(Word *)newWord andDatabase:(BOOL) andDatabase { + NSLog(@"in Add Word to Dictionary %d", andDatabase); // get a pointer to the array for the letter this word belongs to NSMutableArray *wordsForLetter = [words objectForKey:newWord.letter]; // if we don't have an array set yet, create it. @@ -137,14 +138,16 @@ NSUInteger index = [wordsForLetter indexOfObject:newWord]; if (index == NSNotFound) { // add the word to the array - [wordsForLetter addObject:newWord]; + [wordsForLetter addObject:newWord]; + NSLog(@"new Word"); } else { // this word was already in the wordList, update the word object [[wordsForLetter objectAtIndex:index] setTranslation:newWord.translation]; + NSLog(@"update translation"); } } - + if (andDatabase) { // if we are adding to the database we need to sort the array since we aren't pulling out of the database alphabetically [wordsForLetter sortUsingSelector:@selector(compare:)]; Classes/LexikonAppDelegate.m @@ -199,11 +199,12 @@ if (detailViewController == nil) { detailViewController = [[DetailViewController alloc] init]; } + detailViewController.word = word.word; detailViewController.html = [NSString stringWithContentsOfFile: [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"translationTemplate.html"]]; detailViewController.html = [detailViewController.html stringByReplacingOccurrencesOfString:@"{yield}" withString:word.translation]; - + [self.navigationController pushViewController:detailViewController animated:YES]; } @@ -343,7 +344,7 @@ newWord.translation = translation; [appDelegate addWordToDictionary:appDelegate.currentWords word:newWord andDatabase:YES]; - + NSLog(@"added now show"); [self viewWord:newWord]; } else { Classes/MainViewController.m @@ -34,5 +34,7 @@ // remove the word from the database //- (void)deleteFromDatabase; - (NSString *)description; +- (NSComparisonResult)compare:(Word *)aWord; +- (BOOL)isEqual:(Word *)aWord; @end Classes/Word.h @@ -17,6 +17,14 @@ return word; } +- (NSComparisonResult)compare:(Word *)aWord { + return [word compare:aWord.word]; +} + +- (BOOL)isEqual:(Word *)aWord { + return [word isEqual:aWord.word]; +} + - (NSString *)letter { return [[word substringToIndex: 1] uppercaseString]; } Classes/Word.m Icon.png @@ -22,7 +22,7 @@ ); }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 3CE4FB0D0EB9FB0F0088EBD7 /* Lexikon */; activeSDKPreference = iphoneos2.1; activeTarget = 1D6058900D05DD3D006BFB54 /* Lexikon */; @@ -452,7 +452,7 @@ fRef = 3CF7D6530EE555120086D98C /* MainViewController.m */; name = "MainViewController.m: 300"; rLen = 26; - rLoc = 10719; + rLoc = 10645; rType = 0; vrLen = 1969; vrLoc = 9508; @@ -482,7 +482,7 @@ fRef = 3CF7D6530EE555120086D98C /* MainViewController.m */; name = "MainViewController.m: 254"; rLen = 0; - rLoc = 9101; + rLoc = 9027; rType = 0; vrLen = 1553; vrLoc = 8493; @@ -756,9 +756,9 @@ }; 3CF7D6530EE555120086D98C /* MainViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1404, 4103}}"; - sepNavSelRange = "{9101, 0}"; - sepNavVisRange = "{8493, 1553}"; + sepNavIntBoundsRect = "{{0, 0}, {1224, 3960}}"; + sepNavSelRange = "{11065, 0}"; + sepNavVisRange = "{9771, 1977}"; }; }; 3CF7D6540EE555120086D98C /* Word.h */ = { Lexikon.xcodeproj/caleb.pbxuser 0a062118302e985d24b04081a0e10314d73c01fd Caleb Jaffa caleb@clockwi.se http://github.com/octover/lexikon/commit/7f661bc55c21e7db430dd2b1d76a9ca98bcbf303 7f661bc55c21e7db430dd2b1d76a9ca98bcbf303 2008-12-14T14:15:39-08:00 2008-12-14T14:15:39-08:00 fixed duplicate word lookup 584a46462ca98875dcd0d7c39259716e3795c8c0 Caleb Jaffa caleb@clockwi.se