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

Create Examine query that only searches content

Browse Source
This commit is contained in:
Ronald Barendse
2019-11-13 14:39:11 +01:00
parent b0d834668d
commit 9b87b65537
1 changed files with 16 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,39 +201,31 @@ namespace Umbraco.Web
throw new InvalidOperationException($"No index found by name {indexName} or is not of type {typeof(IUmbracoIndex)}");
}
var searcher = umbIndex.GetSearcher();
var query = umbIndex.GetSearcher().CreateQuery(IndexTypes.Content);
ISearchResults results;
IQueryExecutor queryExecutor;
if (culture == "*")
{
// Search everything
results = skip == 0 && take == 0
? searcher.Search(term)
: searcher.Search(term, skip + take);
queryExecutor = query.ManagedQuery(term);
}
else if (string.IsNullOrWhiteSpace(culture))
{
// Only search invariant
queryExecutor = query.Field(UmbracoContentIndex.VariesByCultureFieldName, "n") // Must not vary by culture
.And().ManagedQuery(term);
}
else
{
IBooleanOperation query;
if (string.IsNullOrWhiteSpace(culture))
{
// Only search invariant
query = searcher.CreateQuery()
.Field(UmbracoContentIndex.VariesByCultureFieldName, "n") // Must not vary by culture
.And().ManagedQuery(term);
}
else
{
// Only search the specified culture
var fields = umbIndex.GetCultureAndInvariantFields(culture).ToArray(); // Get all index fields suffixed with the culture name supplied
query = searcher.CreateQuery()
.ManagedQuery(term, fields);
}
results = skip == 0 && take == 0
? query.Execute()
: query.Execute(skip + take);
// Only search the specified culture
var fields = umbIndex.GetCultureAndInvariantFields(culture).ToArray(); // Get all index fields suffixed with the culture name supplied
queryExecutor = query.ManagedQuery(term, fields);
}
var results = skip == 0 && take == 0
? queryExecutor.Execute()
: queryExecutor.Execute(skip + take);
totalRecords = results.TotalItemCount;
return new CultureContextualSearchResults(results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor, culture);