diff --git a/PROMS/DataLoader/Procedures.cs b/PROMS/DataLoader/Procedures.cs index f9f7be9c..1e76b10c 100644 --- a/PROMS/DataLoader/Procedures.cs +++ b/PROMS/DataLoader/Procedures.cs @@ -191,7 +191,7 @@ namespace DataLoader Item parentitem = itm; foreach (DataRowView drw in dv) { - SectItm = MigrateSection(parentitem, cont.Number, cn, drw, ds.Tables["Steps"], SectItm, dicSecCount.Count > 0 ? true : false, pth, docver); + SectItm = MigrateSection(parentitem, ProcNumber, cn, drw, ds.Tables["Steps"], SectItm, dicSecCount.Count > 0 ? true : false, pth, docver); // if no children, add first child (cont) if (addpart) diff --git a/PROMS/DataLoader/Steps.cs b/PROMS/DataLoader/Steps.cs index b3695564..f0b01641 100644 --- a/PROMS/DataLoader/Steps.cs +++ b/PROMS/DataLoader/Steps.cs @@ -77,6 +77,7 @@ namespace DataLoader { txtdirty = true; stptext = MigrateRos(cn, stptext, seqcvt, content, docver); + stptext = stptext.TrimEnd(" ".ToCharArray()); } // 16-bit code has the following two defines. @@ -91,6 +92,7 @@ namespace DataLoader { txtdirty = true; stptext = MigrateTrans(cn, stptext, seqcvt, content, pth); + stptext = stptext.TrimEnd(" ".ToCharArray()); } if (txtdirty) { @@ -196,7 +198,7 @@ namespace DataLoader if ((nxttok = tkstring.IndexOf("\x2")) > -1) // Multiple Change Ids { - Console.WriteLine("Multiple Change ID: {0}", tkstring.Substring(nxttok + 1)); + //Console.WriteLine("Multiple Change ID: {0}", tkstring.Substring(nxttok + 1)); ci.AddItem("Step", "MultipleChangeID", tkstring.Substring(nxttok + 1)); recdirty = true; //recdirty |= AddContentDetail(content, STP_MULT_CHGID, tkstring.Substring(nxttok + 1));