Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Published Content Query has "skip" applied twice #11378

Merged
merged 2 commits into from
Nov 3, 2021
Merged

Published Content Query has "skip" applied twice #11378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea647db
Fix double skip
matthewcare Oct 14, 2021
5092200
More instances of skipping
matthewcare Oct 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,7 @@ public IEnumerable<ISearchResult> Search(string query, UmbracoEntityTypes entity

totalFound = result.TotalItemCount;

var pagedResult = result.Skip(Convert.ToInt32(pageIndex));

return pagedResult;
return result;
}

private bool BuildQuery(StringBuilder sb, string query, string searchFrom, List<string> fields, string type)
Expand Down
5 changes: 2 additions & 3 deletions src/Umbraco.Infrastructure/Examine/ExamineUmbracoIndexingHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,9 +194,8 @@ public void DeleteDocumentsForContentTypes(IReadOnlyCollection<int> removedConte
.Field("nodeType", id.ToInvariantString())
.Execute(QueryOptions.SkipTake(page * pageSize, pageSize));
total = results.TotalItemCount;
var paged = results.Skip(page * pageSize);

foreach (ISearchResult item in paged)

foreach (ISearchResult item in results)
{
if (int.TryParse(item.Id, NumberStyles.Integer, CultureInfo.InvariantCulture, out int contentId))
{
Expand Down
4 changes: 2 additions & 2 deletions src/Umbraco.Infrastructure/PublishedContentQuery.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take
totalRecords = results.TotalItemCount;

return new CultureContextualSearchResults(
results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
results.ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
culture);
}

Expand Down Expand Up @@ -324,7 +324,7 @@ public IEnumerable<PublishedSearchResult> Search(IQueryExecutor query, int skip,

totalRecords = results.TotalItemCount;

return results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot);
return results.ToPublishedSearchResults(_publishedSnapshot);
}

/// <summary>
Expand Down
4 changes: 1 addition & 3 deletions src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,10 @@ public ActionResult<SearchResults> GetSearchResults(string searcherName, string
return SearchResults.Empty();
}

var pagedResults = results.Skip(pageIndex * pageSize);

return new SearchResults
{
TotalRecords = results.TotalItemCount,
Results = pagedResults.Select(x => new SearchResult
Results = results.Select(x => new SearchResult
{
Id = x.Id,
Score = x.Score,
Expand Down