diff --git a/PROMS/DataLoader/RefObjs.cs b/PROMS/DataLoader/RefObjs.cs index 8f6a22e4..57a59dee 100644 --- a/PROMS/DataLoader/RefObjs.cs +++ b/PROMS/DataLoader/RefObjs.cs @@ -70,7 +70,8 @@ namespace DataLoader // '\x15', rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper()), ro.ROUsageID, ROID, rodb.RODbID); // TODO: NEED TO PASS IN ConvertCaret FORMAT FLAG - string roval = TextConvert.ReplaceUnicode(rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper()), conv_caret); + string roval = TextConvert.ConvertDOSSuperAndSubScripts(rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper())); + roval = TextConvert.ReplaceUnicode(roval, conv_caret); //if (roval.Contains("\r") || roval.Contains("\n")) // Console.WriteLine("RO has new Lines"); diff --git a/PROMS/DataLoader/TextConvert.cs b/PROMS/DataLoader/TextConvert.cs index 9f1fb802..ade16792 100644 --- a/PROMS/DataLoader/TextConvert.cs +++ b/PROMS/DataLoader/TextConvert.cs @@ -167,7 +167,7 @@ namespace DataLoader if (DoCaret) s2 = s2.Replace("^", @"\u916"); //s2 = s2.Replace("^", @"\u916"); - s2 = ConvertDOSSuperAndSubScripts(s2); + //s2 = ConvertDOSSuperAndSubScripts(s2); s2 = ConvertFortranFormatToScienctificNotation(s2); @@ -229,7 +229,7 @@ namespace DataLoader { start++; } - else if (str[cnt] == 'E' && cnt > tstr) + else if ((cnt < str.Length -1) && (str[cnt] == 'E') && (cnt > tstr)) { nbytes = (cnt - tstr); // don't include the 'E' outstr += str.Substring(tstr, nbytes); @@ -286,7 +286,7 @@ namespace DataLoader return rtn + cnt; } - private static string ConvertDOSSuperAndSubScripts(string instr) + public static string ConvertDOSSuperAndSubScripts(string instr) { string outstr = ""; string tstr = instr;