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

Browse Source
This commit is contained in:
Kathy Ruffing 2011-06-16 10:30:28 +00:00
parent 161bb92059
commit f1d48204c6
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
View File

@ -569,6 +569,30 @@ namespace VEPROMS.CSLA.Library
} }
} }
//rtnstr = rtnstr.Replace("`", @"\'b0"); // convert backquote to degree - left over from DOS days. //rtnstr = rtnstr.Replace("`", @"\'b0"); // convert backquote to degree - left over from DOS days.
rtnstr = ProcessMacros(rtnstr);
return rtnstr;
}
//
// Takes the ro text value and sees if a macro has been used. If so it will perform the macro
// operation on the substring in the text value
//
// right now the only macro is @HSP(), where every space between the "(" and ")" will be replaced with a hardspace
//
private string ProcessMacros(string str)
{
if( str == null || str == "" ) return str;
string rtnstr = str;
int indx = -1;
while ((indx = rtnstr.ToUpper().IndexOf("@HSP("))>-1)
{
string resstr = rtnstr.Substring(0,indx);
int endHsp = rtnstr.IndexOf(")",indx);
string tmpstr = rtnstr.Substring(indx+5,endHsp-indx-5);
tmpstr = tmpstr.Replace(" ", @"\u160?");
resstr = resstr + tmpstr;
rtnstr = resstr + rtnstr.Substring(endHsp+1);
}
return rtnstr; return rtnstr;
} }

3
PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
View File

@ -178,7 +178,8 @@ namespace VEPROMS.CSLA.Library
SectionInfo sectionInfo = SectionInfo.Get(_Section.ItemID); SectionInfo sectionInfo = SectionInfo.Get(_Section.ItemID);
return sectionInfo.LocalFormat; return sectionInfo.LocalFormat;
} }
return _SectionInfo.LocalFormat; if (_SectionInfo != null)return _SectionInfo.LocalFormat;
return null;
} }
set set
{ {