Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Only check for DOS super/subscript on RO return values

Browse Source
This commit is contained in:
John Jenko 2009-09-01 20:15:54 +00:00
parent f3bb9786f0
commit 8cd80b3832
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PROMS/DataLoader/RefObjs.cs
View File

@ -70,7 +70,8 @@ namespace DataLoader
// '\x15', rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper()), ro.ROUsageID, ROID, rodb.RODbID); // '\x15', rofstinfo.ROFSTLookup.GetRoValue(ROID.Substring(0, 12).ToUpper()), ro.ROUsageID, ROID, rodb.RODbID);
// TODO: NEED TO PASS IN ConvertCaret FORMAT FLAG // 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")) //if (roval.Contains("\r") || roval.Contains("\n"))
// Console.WriteLine("RO has new Lines"); // Console.WriteLine("RO has new Lines");

6
PROMS/DataLoader/TextConvert.cs
View File

@ -167,7 +167,7 @@ namespace DataLoader
if (DoCaret) s2 = s2.Replace("^", @"\u916"); if (DoCaret) s2 = s2.Replace("^", @"\u916");
//s2 = s2.Replace("^", @"\u916"); //s2 = s2.Replace("^", @"\u916");
s2 = ConvertDOSSuperAndSubScripts(s2); //s2 = ConvertDOSSuperAndSubScripts(s2);
s2 = ConvertFortranFormatToScienctificNotation(s2); s2 = ConvertFortranFormatToScienctificNotation(s2);
@ -229,7 +229,7 @@ namespace DataLoader
{ {
start++; 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' nbytes = (cnt - tstr); // don't include the 'E'
outstr += str.Substring(tstr, nbytes); outstr += str.Substring(tstr, nbytes);
@ -286,7 +286,7 @@ namespace DataLoader
return rtn + cnt; return rtn + cnt;
} }
private static string ConvertDOSSuperAndSubScripts(string instr) public static string ConvertDOSSuperAndSubScripts(string instr)
{ {
string outstr = ""; string outstr = "";
string tstr = instr; string tstr = instr;