diff --git a/PROMS/DataLoader/Procedures.cs b/PROMS/DataLoader/Procedures.cs index 9e82da3d..0e079503 100644 --- a/PROMS/DataLoader/Procedures.cs +++ b/PROMS/DataLoader/Procedures.cs @@ -121,10 +121,9 @@ namespace DataLoader // See if no caret convert... Format docverFormat = docver.ActiveFormat; - bool do_cvt = !(docverFormat.PlantFormat.FormatData.XtraOptions("DontConvertCarrotToDelta")); + bool do_cvt = docverFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta; // pass in a 0 on MakeContent for type of procedure, i.e. procedure = 0 (on type field) - // can we save itm.ItemID in a dictionary of outside trans? ex: otrans("vehlp\procs\0POP05-EO00",itm.ItemID)? Content cont = null; Item itm =null; diff --git a/PROMS/DataLoader/Sections.cs b/PROMS/DataLoader/Sections.cs index d6249770..e52595f3 100644 --- a/PROMS/DataLoader/Sections.cs +++ b/PROMS/DataLoader/Sections.cs @@ -318,8 +318,8 @@ namespace DataLoader sectFormat = docverFormat; if (sectFormat != null) { - ismulti = sectFormat.PlantFormat.FormatData.XtraOptions("UseMultiLineSectionTitle"); - conv_caret = !(sectFormat.PlantFormat.FormatData.XtraOptions("DontConvertCarrotToDelta")); + ismulti = sectFormat.PlantFormat.FormatData.SectData.StepSectionData.UseMultiLineSectionTitle; + conv_caret = sectFormat.PlantFormat.FormatData.SectData.ConvertCaretToDelta; } if (fmt != null && fmt != "") if (fmt == docverFormat.Name) fmt = null; string title = SectTitle(cn, dr, ismulti, conv_caret); diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs index fbc2b995..93ae9f39 100644 --- a/PROMS/DataLoader/frmLoader.cs +++ b/PROMS/DataLoader/frmLoader.cs @@ -74,7 +74,7 @@ namespace DataLoader //tbSource.Text = "G:\\VEIP2\\PROCS"; // basic data //tbSource.Text = "G:\\VEFNP\\AOP1.PRC"; // test subsections, checkoffs, comments & continuous action flag //tbSource.Text = "G:\\vecal\\eops.bck"; // test link seq STP_LNK_SEQ - tbSource.Text = "G:\\vewcnckl\\ckl.prc";// multiple change ids. + tbSource.Text = "G:\\vehlp\\procs";// G:\\vewcnckl\\ckl.prc - multiple change ids. break; case "RHMDESKTOP": //tbSource.Text = @"I:\UNZIPPED ACTIVE BASELINE DATA\vehlp\Procs"; // Sub-sections