This commit is contained in:
Kathy Ruffing 2010-08-24 13:40:59 +00:00
parent d38f7afeab
commit dc83ae54c4

View File

@ -41,6 +41,9 @@ namespace DataLoader
ProcFileName = dr["Entry"].ToString();
ProcNumber = dr["Number"].ToString();
frmMain.Status = "Processing Procedure " + ProcNumber + " - " + ProcFileName;
DateTime dts = GetDTS(dr["Date"].ToString(), dr["Time"].ToString());
string userid = dr["initials"].ToString().Trim();
if (userid == null || userid == "") userid = "Migration";
@ -53,6 +56,19 @@ namespace DataLoader
ci.AddItem("Procedure", "ProcCode", tstr);
}
// try to load in fix file data:
FileInfo fi = new FileInfo(pth + @"\" + ProcFileName + @".fix");
if (fi.Exists)
{
FixItems fixItems = new FixItems(fi);
if (fixItems.Count > 0)
{
if (ci == null) ci = new ConfigInfo(null);
if (fixItems[0].Rev!= null && fixItems[0].Rev !="")ci.AddItem("Procedure", "Rev", fixItems[0].Rev);
if (fixItems[0].RevDate != null && fixItems[0].RevDate != "") ci.AddItem("Procedure", "RevDate", fixItems[0].RevDate);
if (fixItems[0].ReviewDate != null && fixItems[0].ReviewDate != "") ci.AddItem("Procedure", "ReviewDate", fixItems[0].ReviewDate);
}
}
// check that there is a "Series" column, i.e. the 10th column, some datasets
// may not have it, for example vetuec\master.sl1
if (dr.ItemArray.Length > 10)
@ -317,6 +333,7 @@ namespace DataLoader
private Item MigrateProcedures(OleDbConnection cn, string pth, DocVersion docver, bool convertProcedures, FormatInfo activeFormat)
{
Item FirstItm = null;
// Loop through Set File for each Procedure
try