diff --git a/PROMS/DataLoader/RefObjs.cs b/PROMS/DataLoader/RefObjs.cs index 8d1bdea8..0de451bb 100644 --- a/PROMS/DataLoader/RefObjs.cs +++ b/PROMS/DataLoader/RefObjs.cs @@ -58,7 +58,8 @@ namespace DataLoader da.Dispose(); return textm; } - int tok = textm.IndexOf('\x15'); + char[] chrrotrn = { '\x15', '\x3a6' }; + int tok = textm.IndexOfAny(chrrotrn); while (tok > -1) { // found a token, add the roid & value into the string and @@ -79,6 +80,10 @@ namespace DataLoader // TODO: NEED TO PASS IN ConvertCaret FORMAT FLAG string roval = TextConvert.ConvertDOSSuperAndSubScripts(rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper())); roval = TextConvert.ReplaceUnicode(roval, conv_caret); + if (textm[tok] == '\x3a6' && roval.IndexOf('\n')>-1) // figure - just get image name + { + roval = roval.Substring(0, roval.IndexOf('\n')); + } //if (roval.Contains("\r") || roval.Contains("\n")) // Console.WriteLine("RO has new Lines"); @@ -111,7 +116,7 @@ namespace DataLoader da.Dispose(); } else - tok = textm.IndexOf('\x15', beg); + tok = textm.IndexOf('\x15', beg); // there would only be one figure - only check for ro after 1st time } if (beg <= textm.Length - 1) rotxt.Append(textm.Substring(beg, textm.Length - beg)); diff --git a/PROMS/DataLoader/Steps.cs b/PROMS/DataLoader/Steps.cs index 0added1d..826c4b0b 100644 --- a/PROMS/DataLoader/Steps.cs +++ b/PROMS/DataLoader/Steps.cs @@ -47,14 +47,7 @@ namespace DataLoader stptext = TextConvert.ConvertText(Textm.Substring(0, tok), conv_caret); string seqcvt = TextConvert.ConvertSeq(stpseq); - - // Figure marker - it should NEVER get here!!! - int tokfig = Textm.IndexOf('\xE8'); - if (tokfig > -1) - { - log.Error("Found a old style figure!"); - log.ErrorFormat("oldstepsequence = {0}", stpseq); - } + string newstptyp = null; bool ManualPagebreak = false; char cbittst = StepType.PadRight(2)[0]; @@ -86,6 +79,13 @@ namespace DataLoader stptext = MigrateRos(cn, stptext, seqcvt, content, docver, conv_caret); stptext = stptext.TrimEnd(" ".ToCharArray()); } + tokrt = Textm.IndexOf('\x3a6'); + if (tokrt > -1) + { + txtdirty = true; + stptext = MigrateRos(cn, stptext, seqcvt, content, docver, conv_caret); + stptext = stptext.TrimEnd(" ".ToCharArray()); + } // 16-bit code has the following two defines. // #define TransitionMarker 0xC2