yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Adds overloads so you can do paging with the TypedSearch methods."

Browse Source 
This reverts commit 089f488c15.
This commit is contained in:
Sebastiaan Janssen
2017-11-08 09:23:29 +01:00
parent 977b30c51a
commit 1f29418ea5
3 changed files with 37 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
src/Umbraco.Web/PublishedContentQuery.cs
View File

@@ -383,38 +383,6 @@ namespace Umbraco.Web
: _dynamicContentQuery.Search(criteria, searchProvider);
}
/// <summary>
/// Searches content
/// </summary>
/// <param name="skip"></param>
/// <param name="take"></param>
/// <param name="totalRecords"></param>
/// <param name="term"></param>
/// <param name="useWildCards"></param>
/// <param name="searchProvider"></param>
/// <returns></returns>
public IEnumerable<IPublishedContent> TypedSearch(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string searchProvider = null)
{
if (_typedContentQuery != null) return _typedContentQuery.TypedSearch(skip, take, out totalRecords, term, useWildCards, searchProvider);
var searcher = Examine.ExamineManager.Instance.DefaultSearchProvider;
if (string.IsNullOrEmpty(searchProvider) == false)
searcher = Examine.ExamineManager.Instance.SearchProviderCollection[searchProvider];
var results = searcher.Search(term, useWildCards);
totalRecords = results.TotalItemCount;
var records = results.Skip(skip);
if (take > 0)
{
records = records.Take(take);
}
return records.ConvertSearchResultToPublishedContent(_contentCache);
}
/// <summary>
/// Searches content
/// </summary>
@@ -423,42 +391,16 @@ namespace Umbraco.Web
/// <param name="searchProvider"></param>
/// <returns></returns>
public IEnumerable<IPublishedContent> TypedSearch(string term, bool useWildCards = true, string searchProvider = null)
{
var total = 0;
return TypedSearch(0, 0, out total, term, useWildCards, searchProvider);
}
/// <summary>
/// Searhes content
/// </summary>
/// <param name="skip"></param>
/// <param name="take"></param>
/// <param name="totalRecords"></param>
/// <param name="criteria"></param>
/// <param name="searchProvider"></param>
/// <returns></returns>
public IEnumerable<IPublishedContent> TypedSearch(int skip, int take, out int totalRecords, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
{
if (_typedContentQuery != null) return _typedContentQuery.TypedSearch(skip, take, out totalRecords, criteria, searchProvider);
if (_typedContentQuery != null) return _typedContentQuery.TypedSearch(term, useWildCards, searchProvider);
var s = Examine.ExamineManager.Instance.DefaultSearchProvider;
if (searchProvider != null)
s = searchProvider;
var searcher = Examine.ExamineManager.Instance.DefaultSearchProvider;
if (string.IsNullOrEmpty(searchProvider) == false)
searcher = Examine.ExamineManager.Instance.SearchProviderCollection[searchProvider];
var results = s.Search(criteria);
totalRecords = results.TotalItemCount;
var records = results.Skip(skip);
if (take > 0)
{
records = records.Take(take);
}
return records.ConvertSearchResultToPublishedContent(_contentCache);
}
var results = searcher.Search(term, useWildCards);
return results.ConvertSearchResultToPublishedContent(_contentCache);
}
/// <summary>
/// Searhes content
@@ -468,9 +410,14 @@ namespace Umbraco.Web
/// <returns></returns>
public IEnumerable<IPublishedContent> TypedSearch(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null)
{
var total = 0;
return TypedSearch(0, 0, out total, criteria, searchProvider);
if (_typedContentQuery != null) return _typedContentQuery.TypedSearch(criteria, searchProvider);
var s = Examine.ExamineManager.Instance.DefaultSearchProvider;
if (searchProvider != null)
s = searchProvider;
var results = s.Search(criteria);
return results.ConvertSearchResultToPublishedContent(_contentCache);
}
#endregion