Commit: 8ece8bbf421226ddce3c4f26df1acff3c279292f - aretokoreConverter (git)

あれとこれのコンバータ

Commit MetaInfo

• Revision: 8ece8bbf421226ddce3c4f26df1acff3c279292f (tree)
• Time: 2011-12-03 17:21:11
• Author: masakih <masakih@user...>
• Commiter: masakih

Log Message

Treat source code

ソースコードの整理。

Change Summary

• modified: BathyScapheDataConverter/BSDCAppDelegate.m

Incremental Difference

--- a/BathyScapheDataConverter/BSDCAppDelegate.m
+++ b/BathyScapheDataConverter/BSDCAppDelegate.m
@@ -71,11 +71,21 @@
 	return bathyscapheSupportFolderPath;
 }
 
+
+- (void)loggingIfNeeded
+{
+	SQLiteDB *db = [[DatabaseManager defaultManager]databaseForCurrentThread];
+	if([db lastErrorID] != SQLITE_OK) {
+		NSLog(@"%@", [db lastError]);
+	}
+}
+
 - (void)updateTime
 {
 	NSDate *now = [NSDate dateWithTimeIntervalSinceNow:0.0];
 	panel.progressTime = [NSDate dateWithTimeIntervalSince1970:[now timeIntervalSinceDate:startTime] - [[NSTimeZone systemTimeZone] secondsFromGMT]];
 }
+
 - (SQLiteReservedQuery *)sqlForInsertion
 {
 	static SQLiteReservedQuery *query = nil;
@@ -141,11 +151,6 @@
 				return;
 			}
 			
-//			NSString *sql = [NSString stringWithFormat:@"INSERT INTO %@ ( %@, %@, %@, %@, %@, %@, %@, %@ ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?)",
-//							 ThreadInfoTableName,
-//							 BoardIDColumn, ThreadIDColumn, ThreadNameColumn, NumberOfAllColumn, NumberOfReadColumn, ModifiedDateColumn, ThreadStatusColumn,
-//							 IsDatOchiColumn];
-			
 			SQLiteReservedQuery *sqlForInsertion = [self sqlForInsertion];
 			[sqlForInsertion cursorWithFormat:
 			 F_Int F_NSString F_NSString F_NSNumberOfInt F_NSNumberOfInt F_NSNumberOfDouble F_NSNumberOfInt F_NSNumberOfInt,
@@ -191,12 +196,26 @@
 	}
 }
 
-- (void)loggingIfNeeded
+- (void)convertBoardHistories:(NSArray *)boards
 {
-	SQLiteDB *db = [[DatabaseManager defaultManager]databaseForCurrentThread];
-	if([db lastErrorID] != SQLITE_OK) {
-		NSLog(@"%@", [db lastError]);
+	panel.message = @"Converting board histories ...";
+	DatabaseManager *dm = [DatabaseManager defaultManager];
+	NSString *sql = [NSString stringWithFormat:@"INSERT INTO %@ (%@, %@, %@) VALUES (?, ?, ?);",
+					 BoardInfoHistoryTableName,
+					 BoardIDColumn, BoardNameColumn, BoardURLColumn];
+	SQLiteReservedQuery *query = [[SQLiteReservedQuery alloc] initWithQuery:sql
+															  usingSQLiteDB:[[DatabaseManager defaultManager] databaseForCurrentThread]];
+	for(BSBoardInformationObject *board in boards) {
+		[self updateTime];
+		NSUInteger boardID = [dm boardIDForURLString:board.boardURL];
+		for(BSBoardHistoryObject *hist in board.histories) {
+			[self updateTime];
+			[query cursorWithFormat:F_Int F_NSString F_NSString,
+			 boardID, hist.boardName, hist.boardURL];
+			[self loggingIfNeeded];
+		}
 	}
+	[query release];
 }
 
 - (void)doConvertToSQLite
@@ -224,25 +243,7 @@
 	[self updateTime];
 	
 	pool = [[NSAutoreleasePool alloc] init];
-	panel.message = @"Converting board histories ...";
-	DatabaseManager *dm = [DatabaseManager defaultManager];
-	NSString *sql = [NSString stringWithFormat:@"INSERT INTO %@ (%@, %@, %@) VALUES (?, ?, ?);",
-					 BoardInfoHistoryTableName,
-					 BoardIDColumn, BoardNameColumn, BoardURLColumn];
-	SQLiteReservedQuery *query = [[SQLiteReservedQuery alloc] initWithQuery:sql
-															  usingSQLiteDB:[[DatabaseManager defaultManager] databaseForCurrentThread]];
-	for(BSBoardInformationObject *board in boards) {
-		[self updateTime];
-		NSUInteger boardID = [dm boardIDForURLString:board.boardURL];
-		for(BSBoardHistoryObject *hist in board.histories) {
-			[self updateTime];
-			[query cursorWithFormat:F_Int F_NSString F_NSString,
-			 boardID, hist.boardName, hist.boardURL];
-			[self loggingIfNeeded];
-		}
-	}
-	[query release];
-	
+	[self convertBoardHistories:boards];
 	panel.amount = 0;
 	panel.count = 0;
 	[pool release];