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

Browse Source
This commit is contained in:
John Jenko 2009-03-24 17:03:46 +00:00
parent c0879cc397
commit b3097a7960
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PROMS/VEPROMS.CSLA.Library/Extension/ItemExt.cs
View File

@ -882,6 +882,7 @@ namespace VEPROMS.CSLA.Library
} }
public string ShortSearchPath public string ShortSearchPath
{ {
//get { return Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07") + " \t" + DisplayText; }
get { return Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07"); } get { return Regex.Replace(_SearchPath, "\x11.*?\x07", "\x07"); }
} }
internal int _SearchAnnotationID; internal int _SearchAnnotationID;
@ -1516,7 +1517,7 @@ namespace VEPROMS.CSLA.Library
IsReadOnly = true; IsReadOnly = true;
} }
#region Text Search #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 try
{ {
@ -1528,6 +1529,7 @@ namespace VEPROMS.CSLA.Library
catch (Exception ex) catch (Exception ex)
{ {
throw new DbCslaException("Error on ItemInfoList.GetChildren", ex); throw new DbCslaException("Error on ItemInfoList.GetChildren", ex);
//return null;
} }
} }
[Serializable()] [Serializable()]
@ -1551,8 +1553,8 @@ namespace VEPROMS.CSLA.Library
get { return _SearchString; } get { return _SearchString; }
set { _SearchString = value; } set { _SearchString = value; }
} }
private bool _CaseSensitive; private int _CaseSensitive;
public bool CaseSensitive public int CaseSensitive
{ {
get { return _CaseSensitive; } get { return _CaseSensitive; }
set { _CaseSensitive = value; } set { _CaseSensitive = value; }
@ -1576,7 +1578,7 @@ namespace VEPROMS.CSLA.Library
set { _IncludeSpecialCharacters = value; } set { _IncludeSpecialCharacters = value; }
} }
public ItemListSearchCriteria(string docVersionList, string stepTypeList, string searchString, 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; _DocVersionList = docVersionList;
_StepTypeList = stepTypeList; _StepTypeList = stepTypeList;
@ -1601,7 +1603,7 @@ namespace VEPROMS.CSLA.Library
cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList); cm.Parameters.AddWithValue("@DocVersionList", criteria.DocVersionList);
cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList); cm.Parameters.AddWithValue("@StepTypeList", criteria.StepTypeList);
cm.Parameters.AddWithValue("@SearchString", criteria.SearchString); 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("@IncludeLinks", (int) criteria.IncludeLinks);
cm.Parameters.AddWithValue("@IncludeRtfFormatting", criteria.IncludeRtfFormatting ? 1 : 0); cm.Parameters.AddWithValue("@IncludeRtfFormatting", criteria.IncludeRtfFormatting ? 1 : 0);
cm.Parameters.AddWithValue("@IncludeSpecialCharacters", criteria.IncludeSpecialCharacters ? 1 : 0); cm.Parameters.AddWithValue("@IncludeSpecialCharacters", criteria.IncludeSpecialCharacters ? 1 : 0);