@@ -9,7 +9,6 @@
#import "LexikonAppDelegate.h"
#import "MainViewController.h"
#import "FMDatabase.h"
-#import "Beacon.h"
@class Word;
@@ -26,8 +25,6 @@
- (void)applicationDidFinishLaunching:(UIApplication *)application {
[window addSubview:navigationController.view];
[window makeKeyAndVisible];
-
- [Beacon initAndStartBeaconWithApplicationCode:APPLICATION_CODE useCoreLocation:NO useOnlyWiFi:NO];
}
- (void)awakeFromNib {
@@ -57,15 +54,9 @@
// save user state
[[NSUserDefaults standardUserDefaults] setBool:swedishToEnglish forKey:@"swedishToEnglish"];
[[NSUserDefaults standardUserDefaults] setObject:currentWord forKey:@"word"];
-
- // stop the analytics
- [[Beacon shared] endBeacon];
}
- (void)applicationDidReceiveMemoryWarning:(UIApplication *)application {
-#ifdef DEBUG
- NSLog(@"MEMORY WARNING");
-#endif
// dehydrate each word's translation from memory
for (NSString *letter in swedishWords) {
[[swedishWords objectForKey:letter] makeObjectsPerformSelector:@selector(dehydrate)];
@@ -109,6 +100,7 @@
[englishWords release];
[swedishWords release];
[currentWord release];
+ [database release];
[super dealloc];
}
Classes/LexikonAppDelegate.m
@@ -1,5 +1,5 @@
#import <Foundation/Foundation.h>
-#import <sqlite3.h>
+#import "sqlite3.h"
#import "FMResultSet.h"
@interface FMDatabase : NSObject
Classes/fmdb/FMDatabase.h
@@ -161,7 +161,7 @@
NSLog(@"The FMDatabase %@ is currently in use.", self);
if (crashOnErrors) {
- *(long*)0 = 0xDEADBEEF;
+ NSAssert1(false, @"The FMDatabase %@ is currently in use.", self);
}
}
@@ -194,8 +194,12 @@
- (void) bindObject:(id)obj toColumn:(int)idx inStatement:(sqlite3_stmt*)pStmt; {
+ if ((!obj) || ((NSNull *)obj == [NSNull null])) {
+ sqlite3_bind_null(pStmt, idx);
+ }
+
// FIXME - someday check the return codes on these binds.
- if ([obj isKindOfClass:[NSData class]]) {
+ else if ([obj isKindOfClass:[NSData class]]) {
sqlite3_bind_blob(pStmt, idx, [obj bytes], [obj length], SQLITE_STATIC);
}
else if ([obj isKindOfClass:[NSDate class]]) {
@@ -273,7 +277,6 @@
}
else if (SQLITE_OK != rc) {
- rc = sqlite3_finalize(pStmt);
if (logsErrors) {
NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
@@ -282,10 +285,12 @@
#ifdef __BIG_ENDIAN__
asm{ trap };
#endif
- *(long*)0 = 0xDEADBEEF;
+ NSAssert2(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
}
}
+ sqlite3_finalize(pStmt);
+
[self setInUse:NO];
return nil;
}
@@ -300,10 +305,6 @@
while (idx < queryCount) {
obj = va_arg(args, id);
- if (!obj) {
- break;
- }
-
if (traceExecution) {
NSLog(@"obj: %@", obj);
}
@@ -339,6 +340,8 @@
[statement release];
+ [self setInUse:NO];
+
return rs;
}
@@ -396,8 +399,7 @@
}
}
else if (SQLITE_OK != rc) {
- int ret = rc;
- rc = sqlite3_finalize(pStmt);
+
if (logsErrors) {
NSLog(@"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
@@ -406,12 +408,14 @@
#ifdef __BIG_ENDIAN__
asm{ trap };
#endif
- *(long*)0 = 0xDEADBEEF;
+ NSAssert2(false, @"DB Error: %d \"%@\"", [self lastErrorCode], [self lastErrorMessage]);
}
}
+ sqlite3_finalize(pStmt);
[self setInUse:NO];
- return ret;
+
+ return NO;
}
}
while (retry);
@@ -426,10 +430,6 @@
obj = va_arg(args, id);
- if (!obj) {
- break;
- }
-
if (traceExecution) {
NSLog(@"obj: %@", obj);
}
@@ -470,12 +470,12 @@
// all is well, let's return.
}
else if (SQLITE_ERROR == rc) {
- NSLog(@"Error calling sqlite3_step (%d: %s) eu", rc, sqlite3_errmsg(db));
+ NSLog(@"Error calling sqlite3_step (%d: %s) SQLITE_ERROR", rc, sqlite3_errmsg(db));
NSLog(@"DB Query: %@", sql);
}
else if (SQLITE_MISUSE == rc) {
// uh oh.
- NSLog(@"Error calling sqlite3_step (%d: %s) eu", rc, sqlite3_errmsg(db));
+ NSLog(@"Error calling sqlite3_step (%d: %s) SQLITE_MISUSE", rc, sqlite3_errmsg(db));
NSLog(@"DB Query: %@", sql);
}
else {
Classes/fmdb/FMDatabase.m
@@ -14,8 +14,11 @@
- (long) longForQuery:(NSString*)objs, ...;
- (BOOL) boolForQuery:(NSString*)objs, ...;
- (double) doubleForQuery:(NSString*)objs, ...;
-- (NSData*) dataForQuery:(NSString*)objs, ...;
- (NSString*) stringForQuery:(NSString*)objs, ...;
+- (NSData*) dataForQuery:(NSString*)objs, ...;
+// Notice that there's no dataNoCopyForQuery:.
+// That would be a bad idea, because we close out the result set, and then what
+// happens to the data that we just didn't copy? Who knows, not I.
@end
Classes/fmdb/FMDatabaseAdditions.h
@@ -47,4 +47,5 @@ return ret;
RETURN_RESULT_FOR_QUERY_WITH_SELECTOR(NSData *, dataForColumnIndex);
}
+
@end
Classes/fmdb/FMDatabaseAdditions.m
@@ -34,6 +34,9 @@
- (long) longForColumn:(NSString*)columnName;
- (long) longForColumnIndex:(int)columnIdx;
+- (long long int) longLongIntForColumn:(NSString*)columnName;
+- (long long int) longLongIntForColumnIndex:(int)columnIdx;
+
- (BOOL) boolForColumn:(NSString*)columnName;
- (BOOL) boolForColumnIndex:(int)columnIdx;
@@ -49,6 +52,14 @@
- (NSData*) dataForColumn:(NSString*)columnName;
- (NSData*) dataForColumnIndex:(int)columnIdx;
+/*
+If you are going to use this data after you iterate over the next row, or after you close the
+result set, make sure to make a copy of the data first (or just use dataForColumn:/dataForColumnIndex:)
+If you don't, you're going to be in a world of hurt when you try and use the data.
+*/
+- (NSData*) dataNoCopyForColumn:(NSString*)columnName;
+- (NSData*) dataNoCopyForColumnIndex:(int)columnIdx;
+
- (void) kvcMagic:(id)object;
@end
Classes/fmdb/FMResultSet.h
@@ -18,16 +18,6 @@
return [rs autorelease];
}
-- (id)init {
- self = [super init];
- if (self) {
- [self setColumnNameToIndexMap:[NSMutableDictionary dictionary]];
- }
-
- return self;
-}
-
-
- (void)dealloc {
[self close];
@@ -46,12 +36,17 @@
[statement release];
statement = nil;
- [parentDB setInUse:NO];
- parentDB = nil; // parentDB is never retained, so no need for a release.
+ // we don't need this anymore... (i think)
+ //[parentDB setInUse:NO];
+ parentDB = nil;
}
- (void) setupColumnNames {
+ if (!columnNameToIndexMap) {
+ [self setColumnNameToIndexMap:[NSMutableDictionary dictionary]];
+ }
+
int columnCount = sqlite3_column_count(statement.statement);
int columnIdx = 0;
@@ -184,10 +179,29 @@
return 0;
}
- return sqlite3_column_int64(statement.statement, columnIdx);
+ return (long)sqlite3_column_int64(statement.statement, columnIdx);
}
- (long) longForColumnIndex:(int)columnIdx {
+ return (long)sqlite3_column_int64(statement.statement, columnIdx);
+}
+
+- (long long int) longLongIntForColumn:(NSString*)columnName {
+
+ if (!columnNamesSetup) {
+ [self setupColumnNames];
+ }
+
+ int columnIdx = [self columnIndexForName:columnName];
+
+ if (columnIdx == -1) {
+ return 0;
+ }
+
+ return sqlite3_column_int64(statement.statement, columnIdx);
+}
+
+- (long long int) longLongIntForColumnIndex:(int)columnIdx {
return sqlite3_column_int64(statement.statement, columnIdx);
}
@@ -283,6 +297,12 @@
return nil;
}
+
+ return [self dataForColumnIndex:columnIdx];
+}
+
+- (NSData*) dataForColumnIndex:(int)columnIdx {
+
int dataSize = sqlite3_column_bytes(statement.statement, columnIdx);
NSMutableData *data = [NSMutableData dataWithLength:dataSize];
@@ -292,18 +312,36 @@
return data;
}
-- (NSData*) dataForColumnIndex:(int)columnIdx {
+
+- (NSData*) dataNoCopyForColumn:(NSString*)columnName {
- int dataSize = sqlite3_column_bytes(statement.statement, columnIdx);
+ if (!columnNamesSetup) {
+ [self setupColumnNames];
+ }
- NSMutableData *data = [NSMutableData dataWithLength:dataSize];
+ int columnIdx = [self columnIndexForName:columnName];
- memcpy([data mutableBytes], sqlite3_column_blob(statement.statement, columnIdx), dataSize);
+ if (columnIdx == -1) {
+ return nil;
+ }
+
+
+ return [self dataNoCopyForColumnIndex:columnIdx];
+}
+
+- (NSData*) dataNoCopyForColumnIndex:(int)columnIdx {
+
+ int dataSize = sqlite3_column_bytes(statement.statement, columnIdx);
+
+ NSData *data = [NSData dataWithBytesNoCopy:(void *)sqlite3_column_blob(statement.statement, columnIdx) length:dataSize freeWhenDone:NO];
return data;
}
+
+
+
- (void)setParentDB:(FMDatabase *)newDb {
parentDB = newDb;
}
Classes/fmdb/FMResultSet.m
@@ -23,7 +23,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>19</string>
+ <string>20</string>
<key>CFBundleShortVersionString</key>
<string>1.2</string>
<key>LSRequiresIPhoneOS</key>
Info.plist
@@ -16,11 +16,13 @@
3C0911FF0EDDA7AF00A982E9 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C0911FE0EDDA7AF00A982E9 /* libsqlite3.dylib */; };
3C0B82520F420FBA005AB976 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C0B82510F420FBA005AB976 /* MainViewController.m */; };
3C3C29C60EE6DC0800028066 /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 3C3C29C50EE6DC0800028066 /* Icon.png */; };
+ 3C3D99120F447ECD0015EAB1 /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3D990C0F447ECD0015EAB1 /* FMResultSet.m */; };
+ 3C3D99130F447ECD0015EAB1 /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3D990E0F447ECD0015EAB1 /* FMDatabase.m */; };
+ 3C3D99140F447ECD0015EAB1 /* FMDatabaseAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C3D99100F447ECD0015EAB1 /* FMDatabaseAdditions.m */; };
3C52BB490F0EB69D006C34C1 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 3C52BB480F0EB69D006C34C1 /* Default.png */; };
3C7E70890ED5F2B50022B3A9 /* database.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3C7E70880ED5F2B50022B3A9 /* database.sqlite3 */; };
3CAD0D450EE7EFBB003C1C97 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */; };
3CB9C87D0EED4674001753BD /* translationTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CB9C87C0EED4674001753BD /* translationTemplate.html */; };
- 3CD1B3300F12754A000D44AD /* libPMAnalytics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD1B32F0F12754A000D44AD /* libPMAnalytics.a */; };
3CD1B33E0F128B96000D44AD /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD1B33D0F128B96000D44AD /* CoreLocation.framework */; };
3CD1B3420F128BA2000D44AD /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CD1B3410F128BA2000D44AD /* SystemConfiguration.framework */; };
3CDAEC670F0FECB2000A0C6E /* AboutView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC660F0FECB2000A0C6E /* AboutView.xib */; };
@@ -31,9 +33,6 @@
3CEE1E580F3F8284000AE3F6 /* SearchSuggestionsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CEE1E570F3F8284000AE3F6 /* SearchSuggestionsController.m */; };
3CEE1E5C0F3F837D000AE3F6 /* SearchSuggestions.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CEE1E5B0F3F837D000AE3F6 /* SearchSuggestions.xib */; };
3CEE1E7A0F404D99000AE3F6 /* searchSuggestionsDropShadow.png in Resources */ = {isa = PBXBuildFile; fileRef = 3CEE1E790F404D99000AE3F6 /* searchSuggestionsDropShadow.png */; };
- 3CF7D64E0EE555030086D98C /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D6480EE555030086D98C /* FMDatabase.m */; };
- 3CF7D64F0EE555030086D98C /* FMDatabaseAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D64A0EE555030086D98C /* FMDatabaseAdditions.m */; };
- 3CF7D6500EE555030086D98C /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D64C0EE555030086D98C /* FMResultSet.m */; };
3CF7D6510EE555030086D98C /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 3CF7D64D0EE555030086D98C /* LICENSE.txt */; };
3CF7D6570EE555120086D98C /* Word.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D6550EE555120086D98C /* Word.m */; };
/* End PBXBuildFile section */
@@ -51,13 +50,17 @@
3C0911FE0EDDA7AF00A982E9 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
3C0B82510F420FBA005AB976 /* MainViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MainViewController.m; sourceTree = "<group>"; };
3C3C29C50EE6DC0800028066 /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
+ 3C3D990C0F447ECD0015EAB1 /* FMResultSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMResultSet.m; path = Classes/fmdb/FMResultSet.m; sourceTree = "<group>"; };
+ 3C3D990D0F447ECD0015EAB1 /* FMResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMResultSet.h; path = Classes/fmdb/FMResultSet.h; sourceTree = "<group>"; };
+ 3C3D990E0F447ECD0015EAB1 /* FMDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabase.m; path = Classes/fmdb/FMDatabase.m; sourceTree = "<group>"; };
+ 3C3D990F0F447ECD0015EAB1 /* FMDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabase.h; path = Classes/fmdb/FMDatabase.h; sourceTree = "<group>"; };
+ 3C3D99100F447ECD0015EAB1 /* FMDatabaseAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabaseAdditions.m; path = Classes/fmdb/FMDatabaseAdditions.m; sourceTree = "<group>"; };
+ 3C3D99110F447ECD0015EAB1 /* FMDatabaseAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabaseAdditions.h; path = Classes/fmdb/FMDatabaseAdditions.h; sourceTree = "<group>"; };
3C52BB480F0EB69D006C34C1 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
3C7E70880ED5F2B50022B3A9 /* database.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = database.sqlite3; sourceTree = "<group>"; };
3CAD0D430EE7EFBB003C1C97 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailViewController.h; path = Classes/DetailViewController.h; sourceTree = "<group>"; };
3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailViewController.m; path = Classes/DetailViewController.m; sourceTree = "<group>"; };
3CB9C87C0EED4674001753BD /* translationTemplate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = translationTemplate.html; sourceTree = "<group>"; };
- 3CD1B32E0F12754A000D44AD /* Beacon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Beacon.h; sourceTree = "<group>"; };
- 3CD1B32F0F12754A000D44AD /* libPMAnalytics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPMAnalytics.a; path = "Pinch Analytics/libPMAnalytics.a"; sourceTree = "<group>"; };
3CD1B33D0F128B96000D44AD /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
3CD1B3410F128BA2000D44AD /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
3CDAEC660F0FECB2000A0C6E /* AboutView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AboutView.xib; sourceTree = "<group>"; };
@@ -70,12 +73,6 @@
3CEE1E570F3F8284000AE3F6 /* SearchSuggestionsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchSuggestionsController.m; sourceTree = "<group>"; };
3CEE1E5B0F3F837D000AE3F6 /* SearchSuggestions.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SearchSuggestions.xib; sourceTree = "<group>"; };
3CEE1E790F404D99000AE3F6 /* searchSuggestionsDropShadow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = searchSuggestionsDropShadow.png; sourceTree = "<group>"; };
- 3CF7D6470EE555030086D98C /* FMDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabase.h; path = Classes/FMDatabase.h; sourceTree = "<group>"; };
- 3CF7D6480EE555030086D98C /* FMDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabase.m; path = Classes/FMDatabase.m; sourceTree = "<group>"; };
- 3CF7D6490EE555030086D98C /* FMDatabaseAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabaseAdditions.h; path = Classes/FMDatabaseAdditions.h; sourceTree = "<group>"; };
- 3CF7D64A0EE555030086D98C /* FMDatabaseAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabaseAdditions.m; path = Classes/FMDatabaseAdditions.m; sourceTree = "<group>"; };
- 3CF7D64B0EE555030086D98C /* FMResultSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMResultSet.h; path = Classes/FMResultSet.h; sourceTree = "<group>"; };
- 3CF7D64C0EE555030086D98C /* FMResultSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMResultSet.m; path = Classes/FMResultSet.m; sourceTree = "<group>"; };
3CF7D64D0EE555030086D98C /* LICENSE.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = LICENSE.txt; path = Classes/LICENSE.txt; sourceTree = "<group>"; };
3CF7D6520EE555120086D98C /* MainViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MainViewController.h; path = Classes/MainViewController.h; sourceTree = "<group>"; };
3CF7D6540EE555120086D98C /* Word.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Word.h; path = Classes/Word.h; sourceTree = "<group>"; };
@@ -92,7 +89,6 @@
1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */,
3C0911FF0EDDA7AF00A982E9 /* libsqlite3.dylib in Frameworks */,
- 3CD1B3300F12754A000D44AD /* libPMAnalytics.a in Frameworks */,
3CD1B33E0F128B96000D44AD /* CoreLocation.framework in Frameworks */,
3CD1B3420F128BA2000D44AD /* SystemConfiguration.framework in Frameworks */,
);
@@ -160,7 +156,6 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
- 3CD1B32F0F12754A000D44AD /* libPMAnalytics.a */,
3C0911FE0EDDA7AF00A982E9 /* libsqlite3.dylib */,
1DF5F4DF0D08C38300B7A737 /* UIKit.framework */,
1D30AB110D05D00D00671497 /* Foundation.framework */,
@@ -172,25 +167,17 @@
3C0910F70EDCB7E700A982E9 /* fmdb */ = {
isa = PBXGroup;
children = (
- 3CF7D6470EE555030086D98C /* FMDatabase.h */,
- 3CF7D6480EE555030086D98C /* FMDatabase.m */,
- 3CF7D6490EE555030086D98C /* FMDatabaseAdditions.h */,
- 3CF7D64A0EE555030086D98C /* FMDatabaseAdditions.m */,
- 3CF7D64B0EE555030086D98C /* FMResultSet.h */,
- 3CF7D64C0EE555030086D98C /* FMResultSet.m */,
+ 3C3D990C0F447ECD0015EAB1 /* FMResultSet.m */,
+ 3C3D990D0F447ECD0015EAB1 /* FMResultSet.h */,
+ 3C3D990E0F447ECD0015EAB1 /* FMDatabase.m */,
+ 3C3D990F0F447ECD0015EAB1 /* FMDatabase.h */,
+ 3C3D99100F447ECD0015EAB1 /* FMDatabaseAdditions.m */,
+ 3C3D99110F447ECD0015EAB1 /* FMDatabaseAdditions.h */,
3CF7D64D0EE555030086D98C /* LICENSE.txt */,
);
name = fmdb;
sourceTree = "<group>";
};
- 3CD1B32D0F12754A000D44AD /* Pinch Analytics */ = {
- isa = PBXGroup;
- children = (
- 3CD1B32E0F12754A000D44AD /* Beacon.h */,
- );
- path = "Pinch Analytics";
- sourceTree = "<group>";
- };
3CDAEDE00F1029F1000A0C6E /* HTML */ = {
isa = PBXGroup;
children = (
@@ -218,7 +205,6 @@
3CF7D6540EE555120086D98C /* Word.h */,
3CF7D6550EE555120086D98C /* Word.m */,
3C0910F70EDCB7E700A982E9 /* fmdb */,
- 3CD1B32D0F12754A000D44AD /* Pinch Analytics */,
);
name = Classes;
sourceTree = "<group>";
@@ -289,14 +275,14 @@
files = (
1D60589B0D05DD56006BFB54 /* main.m in Sources */,
1D3623260D0F684500981E51 /* LexikonAppDelegate.m in Sources */,
- 3CF7D64E0EE555030086D98C /* FMDatabase.m in Sources */,
- 3CF7D64F0EE555030086D98C /* FMDatabaseAdditions.m in Sources */,
- 3CF7D6500EE555030086D98C /* FMResultSet.m in Sources */,
3CF7D6570EE555120086D98C /* Word.m in Sources */,
3CAD0D450EE7EFBB003C1C97 /* DetailViewController.m in Sources */,
3CDAEC6F0F0FEFD6000A0C6E /* AboutViewController.m in Sources */,
3CEE1E580F3F8284000AE3F6 /* SearchSuggestionsController.m in Sources */,
3C0B82520F420FBA005AB976 /* MainViewController.m in Sources */,
+ 3C3D99120F447ECD0015EAB1 /* FMResultSet.m in Sources */,
+ 3C3D99130F447ECD0015EAB1 /* FMDatabase.m in Sources */,
+ 3C3D99140F447ECD0015EAB1 /* FMDatabaseAdditions.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -342,7 +328,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Caleb Jaffa";
- CURRENT_PROJECT_VERSION = 19;
+ CURRENT_PROJECT_VERSION = 20;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -374,7 +360,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 19;
+ CURRENT_PROJECT_VERSION = 20;
DEBUG = 1;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -391,7 +377,7 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
- CURRENT_PROJECT_VERSION = 19;
+ CURRENT_PROJECT_VERSION = 20;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
Lexikon.xcodeproj/project.pbxproj
@@ -31,6 +31,9 @@
- (void)dealloc {
[mySearchBar release];
[detailViewController release];
+ [indexLetters release];
+ [tableView release];
+ [suggestionsController release];
[super dealloc];
}
@@ -83,6 +86,11 @@
[self changeIndexLetters: swedish];
+ // if we are searching we might need to update the suggestions/filter list
+ if (searching) {
+ [self searchBar:mySearchBar textDidChange:mySearchBar.text];
+ }
+
[self.tableView reloadData];
}
@@ -302,7 +310,6 @@
suggestionsController.view.alpha = 1.0f;
}
else {
- NSLog(@"search 0");
suggestionsController.view.alpha = 0.0f;
cancelSearchTableCover.alpha = 0.8f;
}
@@ -340,6 +347,7 @@
}
suggestionsController.suggestions = suggestions;
+ [suggestions release];
[suggestionsController.tableView reloadData];
}
}
@@ -418,7 +426,7 @@
LexikonAppDelegate *appDelegate = (LexikonAppDelegate *)[[UIApplication sharedApplication] delegate];
[UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
- NSString *word = [[searchBar.text copy] capitalizedString];
+ NSString *searchWord = [searchBar.text capitalizedString];
NSString *translationString;
NSString *translation;
NSURL *translationURL;
@@ -428,11 +436,11 @@
[self cancelSearching];
if(appDelegate.swedishToEnglish) {
- translationString = [[NSString stringWithFormat:@"http://lexin.nada.kth.se/Lexin/?dict=sve-eng&lang=source&word=%@", word] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+ translationString = [[NSString stringWithFormat:@"http://lexin.nada.kth.se/Lexin/?dict=sve-eng&lang=source&word=%@", searchWord] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
encoding = NSUTF8StringEncoding;
}
else {
- translationString = [[NSString stringWithFormat:@"http://lexin.nada.kth.se/cgi-bin/sve-eng?:%@", word] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+ translationString = [[NSString stringWithFormat:@"http://lexin.nada.kth.se/cgi-bin/sve-eng?:%@", searchWord] stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
encoding = NSISOLatin1StringEncoding;
}
@@ -453,7 +461,7 @@
translation = [translation substringWithRange: myRange];
Word *newWord = [[Word alloc] init];
- newWord.word = word;
+ newWord.word = searchWord;
newWord.lang = (appDelegate.swedishToEnglish) ? SWE_LANGUAGE : ENG_LANGUAGE;
newWord.translation = translation;
@@ -463,7 +471,7 @@
}
else {
// display error message that the word was not found
- [self searchFailed:[NSString stringWithFormat:@"%@ not found", word]];
+ [self searchFailed:[NSString stringWithFormat:@"%@ not found", searchWord]];
}
}
else {
@@ -474,6 +482,8 @@
// hide the activity indicator
[UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
+ //[searchWord release];
+ searchWord = nil;
}
- (void)searchFailed:(NSString *)message {
MainViewController.m
@@ -109,14 +109,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
- <string key="label">dropDownShadow</string>
- <reference key="source" ref="372490531"/>
- <reference key="destination" ref="135150028"/>
- </object>
- <int key="connectionID">23</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">view</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="191373211"/>
@@ -229,17 +221,8 @@
<string key="className">SearchSuggestionsController</string>
<string key="superclassName">UIViewController</string>
<object class="NSMutableDictionary" key="outlets">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMutableArray" key="dict.sortedKeys">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>dropDownShadow</string>
- <string>tableView</string>
- </object>
- <object class="NSMutableArray" key="dict.values">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIImageView</string>
- <string>UITableView</string>
- </object>
+ <string key="NS.key.0">tableView</string>
+ <string key="NS.object.0">UITableView</string>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
SearchSuggestions.xib
@@ -12,13 +12,11 @@
@interface SearchSuggestionsController : UIViewController {
IBOutlet UITableView *tableView;
- IBOutlet UIImageView *dropDownShadow;
NSMutableArray *suggestions;
MainViewController *main;
}
@property (nonatomic, retain) UITableView *tableView;
-@property (nonatomic, retain) UIImageView *dropDownShadow;
@property (nonatomic, retain) NSMutableArray *suggestions;
@property (nonatomic, retain) MainViewController *main;
SearchSuggestionsController.h
@@ -12,7 +12,7 @@
@implementation SearchSuggestionsController
-@synthesize tableView, suggestions, main, dropDownShadow;
+@synthesize tableView, suggestions, main;
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview
@@ -53,7 +53,10 @@
}
- (void)dealloc {
- [super dealloc];
+ [main release];
+ [suggestions release];
+ [tableView release];
+ [super dealloc];
}
SearchSuggestionsController.m
@@ -29,7 +29,7 @@
<h1>Lexikon</h1>
<p>Version {version} Build {build}<br />© 2009 Caleb Jaffa<br />Database Cache Size: {filesize}</p>
<p>An iPhone application to query and cache results from the online <a href="http://lexin.nada.kth.se/">Lexin</a> Swedish-English dictionary.</p>
-<p>Lexikon uses <a href="http://gusmueller.com/">Gus Mueller</a>’s <a href="http://gusmueller.com/blog/archives/2008/06/new_home_for_fmdb.html">FMDB</a> adapter for SQLite. Anonymous usage statistics are collected using <a href="http://www.pinchmedia.com/">Pinch Media</a>'s analytics.</p>
+<p>Lexikon uses <a href="http://gusmueller.com/">Gus Mueller</a>’s <a href="http://gusmueller.com/blog/archives/2008/06/new_home_for_fmdb.html">FMDB</a> adapter for SQLite.</p>
<p>Problems and feedback can be sent via email to <script type="text/javascript">
//<![CDATA[
aboutView.html
Classes/FMDatabase.h
Classes/FMDatabase.m
Classes/FMDatabaseAdditions.h
Classes/FMDatabaseAdditions.m
Classes/FMResultSet.h
Classes/FMResultSet.m
Classes/fmdb/fmdb.m
Pinch Analytics/libPMAnalytics.a
67086b891e271fbca34d61d843b392b628e98fc7
Caleb Jaffa
caleb@clockwi.se
http://github.com/octover/lexikon/commit/e658df9fdd9ef53bd7e894bbc545f781c5be5c8d
e658df9fdd9ef53bd7e894bbc545f781c5be5c8d
2009-02-12T08:00:13-08:00
2009-02-12T08:00:13-08:00
update to latest fmdb, clang static analyzer is happy, remove pinch analytics
a988436eea2e59801287407050492a5e126dd459
Caleb Jaffa
caleb@clockwi.se