diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs index da690ba3..fc605111 100644 --- a/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs +++ b/PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs @@ -882,7 +882,8 @@ namespace VEPROMS.CSLA.Library } public string ShortSearchPath { - get { return Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07"); } + //get { return Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07") + " \t" + DisplayText; } + get { return Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07"); } } internal int _SearchAnnotationID; public int SearchAnnotationID @@ -1516,7 +1517,7 @@ namespace VEPROMS.CSLA.Library IsReadOnly = true; } #region Text Search - public static ItemInfoList GetListFromTextSearch(string docVersionList, string stepTypeList, string searchString, bool caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters) + public static ItemInfoList GetListFromTextSearch(string docVersionList, string stepTypeList, string searchString, int caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters) { try { @@ -1528,6 +1529,7 @@ namespace VEPROMS.CSLA.Library catch (Exception ex) { throw new DbCslaException("Error on ItemInfoList.GetChildren", ex); + //return null; } } [Serializable()] @@ -1551,8 +1553,8 @@ namespace VEPROMS.CSLA.Library get { return _SearchString; } set { _SearchString = value; } } - private bool _CaseSensitive; - public bool CaseSensitive + private int _CaseSensitive; + public int CaseSensitive { get { return _CaseSensitive; } set { _CaseSensitive = value; } @@ -1576,7 +1578,7 @@ namespace VEPROMS.CSLA.Library set { _IncludeSpecialCharacters = value; } } public ItemListSearchCriteria(string docVersionList, string stepTypeList, string searchString, - bool caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters) + int caseSensitive, ItemSearchIncludeLinks includeLinks, bool includeRtfFormatting, bool includeSpecialCharacters) { _DocVersionList = docVersionList; _StepTypeList = stepTypeList; @@ -1601,7 +1603,7 @@ namespace VEPROMS.CSLA.Library cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList); cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList); cm.Parameters.AddWithValue("@SearchString", criteria.SearchString); - cm.Parameters.AddWithValue("@CaseSensitive", criteria.CaseSensitive ? 1 : 0); + cm.Parameters.AddWithValue("@CaseSensitive", criteria.CaseSensitive); cm.Parameters.AddWithValue("@IncludeLinks", (int) criteria.IncludeLinks); cm.Parameters.AddWithValue("@IncludeRtfFormatting", criteria.IncludeRtfFormatting ? 1 : 0); cm.Parameters.AddWithValue("@IncludeSpecialCharacters", criteria.IncludeSpecialCharacters ? 1 : 0);