This commit is contained in:
2012-06-04 12:41:32 +00:00
parent bd0c8e2157
commit f3675b7ed1
3 changed files with 28 additions and 14 deletions

View File

@@ -238,9 +238,9 @@ namespace VEPROMS.CSLA.Library
string ROID = ROID16.Substring(0,12);
if (dicRos == null) ParseIntoDictionary(_ROFst!=null?_ROFst.ROLookup:_ROFstInfo.ROLookup);
// Use the ROID to get the value from the dictionary
if (dicRos.ContainsKey(ROID))
if (dicRos.ContainsKey(ROID.ToUpper()))
{
rochild rochld = (rochild)dicRos[ROID];
rochild rochld = (rochild)dicRos[ROID.ToUpper()];
if (rochld.value != null && rochld.value != string.Empty)
return rochld.value;
if (rochld.children != null)
@@ -268,9 +268,9 @@ namespace VEPROMS.CSLA.Library
string ROID = ROID16.Substring(0, 12);
if (dicRos == null) ParseIntoDictionary(_ROFst != null ? _ROFst.ROLookup : _ROFstInfo.ROLookup);
// Use the ROID to get the value from the dictionary
if (dicRos.ContainsKey(ROID))
if (dicRos.ContainsKey(ROID.ToUpper()))
{
rochild rochld = (rochild)dicRos[ROID];
rochild rochld = (rochild)dicRos[ROID.ToUpper()];
return rochld;
}
rochild tmp = new rochild();
@@ -281,9 +281,9 @@ namespace VEPROMS.CSLA.Library
{
if (dicRos == null) ParseIntoDictionary(_ROFst != null ? _ROFst.ROLookup : _ROFstInfo.ROLookup);
// Use the ROID to get the value from the dictionary
if (dicRos.ContainsKey(ROID))
if (dicRos.ContainsKey(ROID.ToUpper()))
{
rochild rochld = (rochild)dicRos[ROID];
rochild rochld = (rochild)dicRos[ROID.ToUpper()];
return rochld;
}
rochild tmp = new rochild();
@@ -520,10 +520,10 @@ namespace VEPROMS.CSLA.Library
if (tmp.children != null)
{
foreach (rochild child in tmp.children)
if(!dicRos.ContainsKey(child.roid))
dicRos.Add(child.roid, child);
if (!dicRos.ContainsKey(child.roid.ToUpper()))
dicRos.Add(child.roid.ToUpper(), child);
}
dicRos.Add(tmp.roid, tmp);
dicRos.Add(tmp.roid.ToUpper(), tmp);
if (!dicRosIntIDs.ContainsKey(tmp.ID)) dicRosIntIDs.Add(tmp.ID, tmp);
int j;
for (j = i - 1; j >= 0 && tmp.ID < myGrp.children[j].ID; j--)