diff --git a/PROMS/DataLoader/DocVersions.cs b/PROMS/DataLoader/DocVersions.cs index 20438f0e..59b4681f 100644 --- a/PROMS/DataLoader/DocVersions.cs +++ b/PROMS/DataLoader/DocVersions.cs @@ -36,10 +36,15 @@ namespace DataLoader { long lTime = DateTime.Now.Ticks; string pth = docver.Title; + if (!File.Exists(pth + @"\set.dbf") || !File.Exists(pth + @"\curset.dat")) return new TimeSpan(); // Open connection OleDbConnection cn = new OleDbConnection(@"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + pth + ";Extended Properties=dBase III;Persist Security Info=False"); if (convertProcedures) { + // JSJ 02/10/2010 - Remove all the .INF files before proceeding to convert. + // The INF files contain a path to a corresponding NDX file - had data with bat NDX path + if (File.Exists(pth + @"\*.inf")) + File.Delete(pth + @"\*.inf"); _OutTran = new OutsideTransition(cn); MigrateROFST(pth, docver); // Migrate library documents @@ -56,17 +61,19 @@ namespace DataLoader } // Process Procedures Item itm = null; - if (convertProcedures || docver.VersionType == (int)VEPROMS.CSLA.Library.VersionTypeEnum.WorkingDraft) + if (convertProcedures || docver.VersionType == (int)VEPROMS.CSLA.Library.VersionTypeEnum.WorkingDraft || docver.VersionType == (int)VEPROMS.CSLA.Library.VersionTypeEnum.Approved) itm = MigrateProcedures(cn, pth, docver, convertProcedures); // Show any Missing Transtitons (i.e. Transitions which have not been processed) lTime = DateTime.Now.Ticks - lTime; if (convertProcedures) { ShowMissingTransitions(); - frmMain.Status = string.Format("{0}\r\nConversion completed in {1} seconds.", pth, TimeSpan.FromTicks(lTime).TotalSeconds); + //frmMain.Status = string.Format("{0}\r\nConversion completed in {1} seconds.", pth, TimeSpan.FromTicks(lTime).TotalSeconds); + TimeSpan ts = TimeSpan.FromTicks(lTime); + frmMain.Status = string.Format("{0}\r\nConversion completion time: {1:D2}:{2:D2}:{3:D2}.{4} ({5} Total Seconds)", pth, ts.Hours, ts.Minutes, ts.Seconds, ts.Milliseconds, ts.TotalSeconds); log.InfoFormat("Completed Migration of {0}", pth); - MessageBox.Show("Completed Migration of " + pth); + //MessageBox.Show("Completed Migration of " + pth); //jsj commented out to let it run through if (rofstinfo != null) rofstinfo.ROFSTLookup.Close(); dicTrans_ItemDone.Clear(); dicTrans_ItemDone = null;