diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index 2083f1ba..5657fa5f 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -868,10 +868,6 @@ namespace VEPROMS.CSLA.Library //{ // return ToString(); //} - public string nz(string str, string def) - { - return (str == null ? def : str); - } internal string _SearchDVPath; public string SearchDVPath { @@ -966,7 +962,7 @@ namespace VEPROMS.CSLA.Library { get { - string number = (MyContent.Type >= 20000 ? Ordinal.ToString() + "." : (nz(DisplayNumber,"")==""? DisplayText: DisplayNumber)); + string number = (MyContent.Type >= 20000 ? Ordinal.ToString() + "." : ((DisplayNumber ?? "")==""? DisplayText: DisplayNumber)); ItemInfo parent = this; while (parent.MyPrevious != null) parent = parent.MyPrevious; if (parent.ItemPartCount == 0) @@ -982,7 +978,7 @@ namespace VEPROMS.CSLA.Library { get { - string number = (MyContent.Type >= 20000 ? Ordinal.ToString() + "." : (nz(MyContent.Number, "") == "" ? MyContent.Text : MyContent.Number)); + string number = (MyContent.Type >= 20000 ? Ordinal.ToString() + "." : ((MyContent.Number ?? "") == "" ? MyContent.Text : MyContent.Number)); ItemInfo parent = this; while (parent.MyPrevious != null) parent = parent.MyPrevious; if (parent.ItemPartCount == 0) @@ -1507,7 +1503,7 @@ namespace VEPROMS.CSLA.Library using (SqlCommand cm = cn.CreateCommand()) { cm.CommandType = CommandType.StoredProcedure; - cm.CommandText = "vesp_SearchItemAndChildren"; + cm.CommandText = "vesp_SearchItemAndChildrenNew"; cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList); cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList); cm.Parameters.AddWithValue("@SearchString", criteria.SearchString);