Use new settings

Removed outdated comments
This commit is contained in:
Rich
2012-01-13 18:40:46 +00:00
parent b480a879c5
commit 617f060bee
5 changed files with 246 additions and 21 deletions

View File

@@ -82,25 +82,12 @@ namespace DataLoader
{
try
{
//#if DEBUG
if (VlnSettings.DebugMode)
{
MessageBox.Show(@"Format files are taken from c:\development\fmtall");
_FmtAllPath = @"c:\development\fmtall";
_GenmacAllPath = @"c:\development\genmacall";
}
//#else
else
{
MessageBox.Show(@"Format files are taken from " + vepromspath + @"\fmtall");
_FmtAllPath = vepromspath + @"\fmtall";
_GenmacAllPath = vepromspath + @"\genmacall";
}
//#endif
_FmtAllPath = frmMain.MySettings.FormatFolder;
_GenmacAllPath = frmMain.MySettings.GenMacFolder;
frmMain.Status = "Make Connection";
// make the initial database connection record, annotation types & top
// system folder.
dbConn = Connection.MakeConnection("Default", "Default", "Data Source=.\\SQLEXPRESS;Initial Catalog=VEPROMS;Integrated Security=True", 1, null, DateTime.Now, "Migration");
dbConn = Connection.MakeConnection("Default", "Default", frmMain.MySettings.ConnectionString.Replace("{DBName}",frmMain.MySettings.DBName), 1, null, DateTime.Now, "Migration");
ConfigFile cfg = new ConfigFile();
frmMain.Status = "Add AnnotationTypes";