Skip to content

Commit 1c4cab5

Browse files
authored
Published Content Query has "skip" applied twice (#11378)
* Fix double skip Skipping is done as part of the query now, causing `skip` to be applied twice * More instances of skipping Fix more areas where skip is applied twice
1 parent 9a64df7 commit 1c4cab5

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

src/Umbraco.Examine.Lucene/BackOfficeExamineSearcher.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,7 @@ public IEnumerable<ISearchResult> Search(string query, UmbracoEntityTypes entity
145145

146146
totalFound = result.TotalItemCount;
147147

148-
var pagedResult = result.Skip(Convert.ToInt32(pageIndex));
149-
150-
return pagedResult;
148+
return result;
151149
}
152150

153151
private bool BuildQuery(StringBuilder sb, string query, string searchFrom, List<string> fields, string type)

src/Umbraco.Infrastructure/Examine/ExamineUmbracoIndexingHandler.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,9 +194,8 @@ public void DeleteDocumentsForContentTypes(IReadOnlyCollection<int> removedConte
194194
.Field("nodeType", id.ToInvariantString())
195195
.Execute(QueryOptions.SkipTake(page * pageSize, pageSize));
196196
total = results.TotalItemCount;
197-
var paged = results.Skip(page * pageSize);
198-
199-
foreach (ISearchResult item in paged)
197+
198+
foreach (ISearchResult item in results)
200199
{
201200
if (int.TryParse(item.Id, NumberStyles.Integer, CultureInfo.InvariantCulture, out int contentId))
202201
{

src/Umbraco.Infrastructure/PublishedContentQuery.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ public IEnumerable<PublishedSearchResult> Search(string term, int skip, int take
295295
totalRecords = results.TotalItemCount;
296296

297297
return new CultureContextualSearchResults(
298-
results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
298+
results.ToPublishedSearchResults(_publishedSnapshot.Content), _variationContextAccessor,
299299
culture);
300300
}
301301

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

325325
totalRecords = results.TotalItemCount;
326326

327-
return results.Skip(skip).ToPublishedSearchResults(_publishedSnapshot);
327+
return results.ToPublishedSearchResults(_publishedSnapshot);
328328
}
329329

330330
/// <summary>

src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,10 @@ public ActionResult<SearchResults> GetSearchResults(string searcherName, string
9191
return SearchResults.Empty();
9292
}
9393

94-
var pagedResults = results.Skip(pageIndex * pageSize);
95-
9694
return new SearchResults
9795
{
9896
TotalRecords = results.TotalItemCount,
99-
Results = pagedResults.Select(x => new SearchResult
97+
Results = results.Select(x => new SearchResult
10098
{
10199
Id = x.Id,
102100
Score = x.Score,

0 commit comments

Comments
 (0)