From 3e010e87b2daf3a6fc7b07cec4bd08db0fe4cf03 Mon Sep 17 00:00:00 2001
From: Rich <rmark@volian.com>
Date: Wed, 19 Feb 2014 03:32:38 +0000
Subject: [PATCH] Return ? when RO Value is null

---
 PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs   | 4 ++--
 PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
index 642282e1..ba06b2ea 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs
@@ -285,9 +285,9 @@ namespace VEPROMS.CSLA.Library
 				{
 					foreach (rochild child in rochld.children)
 						if (child.roid.ToUpper() == ROID16.ToUpper() || (child.roid.EndsWith("0041") && ROID16.EndsWith("0000")))
-							return FixUnitROs(child.value);
+							return FixUnitROs(child.value ?? "?");
 					// if there isn't a specific match for multi-return values, default to the first child. 
-					return FixUnitROs(rochld.children[0].value);
+					return FixUnitROs(rochld.children[0].value ?? "?");
 				}
 			}
 			//if (ROID == "FFFF00000001") return _ROFstInfo.ROFstAssociations[0].MyDocVersion.DocVersionConfig.Unit_Number;
diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
index 513a257e..86933779 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/ContentExt.cs
@@ -198,6 +198,8 @@ namespace VEPROMS.CSLA.Library
 					}
 				}
 			}
+			if (_Text == string.Empty)
+				_Text = "?";
 		}
 		public void LoadNonCachedGrid()
 		{