提交: 1a0185e4c8ac650f5189d10bb15ceacc84689b19 - BSDBViewer (git)

BathyScapheのSQLiteデータベース内を覗くアプリ

Commit MetaInfo

• 修订版: 1a0185e4c8ac650f5189d10bb15ceacc84689b19 (tree)
• 时间: 2008-07-06 10:19:03
• 作者: masakih <masakih@user...>
• Commiter: masakih

Log Message

情報削除時に同時にFavoritesも削除。

git-svn-id: svn+ssh://macmini/usr/local/svnrepos/BSDBViewer/BSDBViewer@13 477addb1-df5c-4826-a637-c2b1bdcd60d4

更改概述

• modified: BSDBViewer.m
• modified: Makefile

差异

--- a/BSDBViewer.m
+++ b/BSDBViewer.m
@@ -228,7 +228,7 @@ final:
 - (void)deleteThreadInformations:(NSArray *)infos
 {
 	NSString *query = 
-	@"DELETE FROM ThreadInfo "
+	@"DELETE FROM ? "
 	@"WHERE "
 	@"boardid = ? "
 	@"AND "
@@ -246,18 +246,37 @@ final:
 	while(obj = [enume nextObject]) {
 		id info = [obj objectForKey:@"threadid"];
 		if(!info) continue;
-		NSArray *values = [NSArray arrayWithObjects:targetBoardID, info, nil];
+		NSArray *values = [NSArray arrayWithObjects:
+			@"ThreadInfo",
+			targetBoardID, info, nil];
 		[deleQ cursorForBindValues:values];
 		if([db lastErrorID] != 0) {
 			NSLog(@"Fail DELETE thread info: %@", obj);
 			NSLog(@"Fail Sending Query: %@", query);
 			NSLog(@"SQLite Error: %@", [db lastError]);
+			goto abort;
+		}
+		values = [NSArray arrayWithObjects:
+			@"Favorites",
+			targetBoardID, info, nil];
+		[deleQ cursorForBindValues:values];
+		if([db lastErrorID] != 0) {
+			NSLog(@"Fail DELETE Favorites: %@", obj);
+			NSLog(@"Fail Sending Query: %@", query);
+			NSLog(@"SQLite Error: %@", [db lastError]);
+			goto abort;
 		}
 	}
 	[db commitTransaction];
 	
 	[threadSource update:self];
 	[self decrementProgressStack];
+
+	return;
+	
+abort:
+	[db rollbackTransaction];
+	[self decrementProgressStack];
 }
 
 - (NSArray *)targetObjectsInTableView:(id)view arrayController:(NSArrayController *)ac

--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,8 @@ all:
 
 tagging:
 	@echo "Tagging the $(VERSION) release of BSDBViewer project."
-	echo svn copy $(HEAD) $(TAGS_DIR)/release-$(VERSION)
+	@echo
+	@echo svn copy $(HEAD) $(TAGS_DIR)/release-$(VERSION)
 
 Localizable: BSTRADocument.m
 	genstrings -o English.lproj $<