Commits

Tuukka Norri committed 4a61007

BaseTen Assistant and it s help
- Added a logging assertion to check that baseten.refresh_caches succeeded when terminating the assistant.
- Also fixed the SQL function name.
- Commented out links to help index in the assisntant's help because they didn't work and we have less than five help pages.
- Added remarks about the configuration menu, schemas and dry run.
- Removed C-style comment marks from the assistant's log output.

Comments (0)

Files changed (8)

BaseTenAssistant/English.lproj/BaseTen Assistant Help/BaseTen Assistant Help.helpindex

Binary file modified.

BaseTenAssistant/English.lproj/BaseTen Assistant Help/BaseTen Assistant Help.html

 			<div id="navleftbox">
 				<a class="navlink_left" href="help:anchor='access' bookID=BaseTen%20Assistant%20Help"></a>
 			</div>
+			<!--
 			<div id="navrightbox">
 				<a class="navlink_right" href="help:anchor='xall' bookID=BaseTen%20Assistant%20Help">Index</a>
 			</div>
+			-->
 		</div>
 		<!--closes top navigation area-->
 	
 										<!--adds rule-->
 										<div id="rule"></div>
 
-										<p><a href="help:anchor='xall' bookID=BaseTen%20Assistant%20Help">Index</a></p>
+										<!--
+										<p><a href="help:anchor='help:topic_list' bookID=BaseTen%20Assistant%20Help">Index</a></p>
+										-->
 											
 										<p><a href="http://basetenframework.org/" class="weblink">basetenframework.org</a></p>
 									</div>

BaseTenAssistant/English.lproj/BaseTen Assistant Help/topics/connecting-to-postgresql.html

 			<div id="navleftbox">
 				<a class="navlink_left" href="help:anchor='access' bookID=BaseTen Assistant Help">Home</a>
 			</div>
+			<!-- 
 			<div id="navrightbox">
 				<a class="navlink_right" href="help:anchor='xall' bookID=BaseTen Assistant Help">Index</a>
 			</div>
+			-->
 		</div>
 		<!--closes top navigation area-->
 		

BaseTenAssistant/English.lproj/BaseTen Assistant Help/topics/importing-a-coredata-model.html

 			<div id="navleftbox">
 				<a class="navlink_left" href="help:anchor='access' bookID=BaseTen Assistant Help">Home</a>
 			</div>
+			<!--
 			<div id="navrightbox">
 				<a class="navlink_right" href="help:anchor='xall' bookID=BaseTen Assistant Help">Index</a>
 			</div>
+			-->
 		</div>
 		<!--closes top navigation area-->
 		
 							Choose which entities you want to import.
 						</p>
 						<p class="taskprimtextlongtext">
-							TODO: details, including configurations, schema name, dry run, action menu (check-all and check-non)
+							In case your data model has different configurations, you have the option to select the one from which you'd like to import the entities.
+						</p>
+						<p class="taskprimtextlongtext">
+							If you want the tables to be placed in some other schema than public, enter its name in the Schema Name field.
+						</p>
+						<p class="taskprimtextlongtext">
+							Clicking Dry Run will output the SQL statements in the Log window before actually sending them to the database.
 						</p>
 					</div><!--closes taskprimcontent-->
 				</div><!-- closes taskprimtext -->

BaseTenAssistant/English.lproj/BaseTen Assistant Help/topics/known-bugs.html

 			<div id="navleftbox">
 				<a class="navlink_left" href="help:anchor='access' bookID=BaseTen Assistant Help">Home</a>
 			</div>
+			<!-- 
 			<div id="navrightbox">
 				<a class="navlink_right" href="help:anchor='xall' bookID=BaseTen Assistant Help">Index</a>
 			</div>
+			-->
 		</div>
 		<!--closes top navigation area-->
 		
 		<div id="introbox">
 			<div class="introprimtext">
 				<p class="introprimtextlongtext">
-					A list of known bugs in BaseTen Assistant.
 					You can get a list of know bugs and register bugs you find in the software on the BaseTen framework website.
 				</p>
 			</div><!--closes introprimtext-->

BaseTenAssistant/English.lproj/BaseTen Assistant Help/topics/resolving-model-compiler-errors.html

 			<div id="navleftbox">
 				<a class="navlink_left" href="help:anchor='access' bookID=BaseTen Assistant Help">Home</a>
 			</div>
+			<!-- 
 			<div id="navrightbox">
 				<a class="navlink_right" href="help:anchor='xall' bookID=BaseTen Assistant Help">Index</a>
 			</div>
+			-->
 		</div>
 		<!--closes top navigation area-->
 		

BaseTenAssistant/English.lproj/Localizable.strings

Binary file modified.

BaseTenAssistant/Sources/BXAController.m

 #import <BaseTen/BXPGDatabaseDescription.h>
 #import <BaseTen/BXLocalizedString.h>
 #import <BaseTen/PGTSConstants.h>
+#import <BaseTen/BXLogger.h>
 
 #import <sys/socket.h>
 //Patch by Tim Bedford 2008-08-11
 
 - (void) terminateAfterRefresh: (PGTSResultSet *) res
 {
+	BXAssertLog ([res querySucceeded], @"Expected query to succeed. Error: %@", [res error]);
 	[self hideProgressPanel];
 	[self finishTermination]; //Patch by Tim Bedford 2008-08-11
 }
 	PGTSConnection* connection = [[(BXPGInterface *) [mContext databaseInterface] transactionHandler] connection];
 	[mProgressCancelButton setEnabled: NO];
 	[self displayProgressPanel: NSLocalizedString(@"Refreshing caches", @"Progress panel message")]; //Patch by Tim Bedford 2008-08-11
-	[connection sendQuery: @"SELECT baseten.refreshcaches ();" delegate: self callback: callback];
+	[connection sendQuery: @"SELECT baseten.refresh_caches ();" delegate: self callback: callback];
 }
 @end