diff --git a/PROMS/DataLoader/RefObjs.cs b/PROMS/DataLoader/RefObjs.cs index 2f1b6c1b..7a5da128 100644 --- a/PROMS/DataLoader/RefObjs.cs +++ b/PROMS/DataLoader/RefObjs.cs @@ -25,7 +25,7 @@ namespace DataLoader { public partial class Loader { - private string MigrateRos(OleDbConnection cn, string textm, string seqcvt, Content content, DocVersion docver, bool conv_caret) + private string MigrateRos(OleDbConnection cn, string textm, string seqcvt, Content content, DocVersion docver, bool conv_caret,ref int rotype) { StringBuilder rotxt = new StringBuilder(); int instance = 0; @@ -73,6 +73,8 @@ namespace DataLoader try { string rov = rofstinfo.ROFSTLookup.GetRoValue(ROID.ToUpper()); + ROFSTLookup.rochild myro = rofstinfo.ROFSTLookup.GetRoChild12(ROID.ToUpper()); + rotype = Math.Max(rotype, myro.type); //jsj string rov = TextConvert.ConvertText(rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper())); //string results = string.Format(@"{0}{1}\v #Link:ReferencedObject:{2} {3} {4}\v0", // '\x15', rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper()), ro.ROUsageID, ROID, rodb.RODbID); diff --git a/PROMS/DataLoader/Steps.cs b/PROMS/DataLoader/Steps.cs index 7bef8804..81525d2d 100644 --- a/PROMS/DataLoader/Steps.cs +++ b/PROMS/DataLoader/Steps.cs @@ -46,9 +46,9 @@ namespace DataLoader stptext = TextConvert.ConvertText(Textm, conv_caret); else stptext = TextConvert.ConvertText(Textm.Substring(0, tok), conv_caret); - + //string stpTextOrg = stptext; string seqcvt = TextConvert.ConvertSeq(stpseq); - + string newstptyp = null; bool ManualPagebreak = false; char cbittst = StepType.PadRight(2)[0]; @@ -74,20 +74,21 @@ namespace DataLoader // Before we save it, handle RO & Transitions tokens. int tokrt = Textm.IndexOf('\x15'); bool txtdirty = false; - bool bIsROTable = false; + bool isROTable = false; + int rotype = 0; if (tokrt > -1) { txtdirty = true; - stptext = MigrateRos(cn, stptext, seqcvt, content, docver, conv_caret); + stptext = MigrateRos(cn, stptext, seqcvt, content, docver, conv_caret, ref rotype); stptext = stptext.TrimEnd(" ".ToCharArray()); // if this is a table RO, then save a flag in the config - bIsROTable = (Textm.Length == 1); + isROTable = (rotype == 2); } tokrt = Textm.IndexOf('\x3a6'); if (tokrt > -1) { txtdirty = true; - stptext = MigrateRos(cn, stptext, seqcvt, content, docver, conv_caret); + stptext = MigrateRos(cn, stptext, seqcvt, content, docver, conv_caret, ref rotype); stptext = stptext.TrimEnd(" ".ToCharArray()); } @@ -108,7 +109,7 @@ namespace DataLoader //string fixStpText = FixStepText(stptext,content.Type); string fixStpText = ""; if (IsATable(content.Type)) - fixStpText = ConvertTableToGrid(stptext, content, fmt, bIsROTable); + fixStpText = ConvertTableToGrid(stptext, content, fmt, isROTable); else fixStpText = FixStepText(stptext); if (fixStpText != stptext)