From 1f29418ea5ed9c12e9731cd29d92ffcadb60f1c1 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 8 Nov 2017 09:23:29 +0100 Subject: [PATCH 1/2] Revert "Adds overloads so you can do paging with the TypedSearch methods." This reverts commit 089f488c15a25bbe60412a945b0f224622e2b865. --- .../ITypedPublishedContentQuery.cs | 20 ----- src/Umbraco.Web/PublishedContentQuery.cs | 83 ++++--------------- src/Umbraco.Web/UmbracoHelper.cs | 73 +++++----------- 3 files changed, 37 insertions(+), 139 deletions(-) diff --git a/src/Umbraco.Web/ITypedPublishedContentQuery.cs b/src/Umbraco.Web/ITypedPublishedContentQuery.cs index 0ad7302ce2..893c036958 100644 --- a/src/Umbraco.Web/ITypedPublishedContentQuery.cs +++ b/src/Umbraco.Web/ITypedPublishedContentQuery.cs @@ -50,18 +50,6 @@ namespace Umbraco.Web /// IEnumerable TypedSearch(string term, bool useWildCards = true, string searchProvider = null); - /// - /// Searches content - /// - /// - /// - /// - /// - /// - /// - /// - IEnumerable TypedSearch(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string searchProvider = null); - /// /// Searhes content /// @@ -69,13 +57,5 @@ namespace Umbraco.Web /// /// IEnumerable TypedSearch(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null); - - /// - /// Searhes content - /// - /// - /// - /// - IEnumerable TypedSearch(int skip, int take, out int totalrecords, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null); } } \ No newline at end of file diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs index 49d38e17b2..f0f2461ad8 100644 --- a/src/Umbraco.Web/PublishedContentQuery.cs +++ b/src/Umbraco.Web/PublishedContentQuery.cs @@ -383,38 +383,6 @@ namespace Umbraco.Web : _dynamicContentQuery.Search(criteria, searchProvider); } - /// - /// Searches content - /// - /// - /// - /// - /// - /// - /// - /// - public IEnumerable 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); - } - /// /// Searches content /// @@ -423,42 +391,16 @@ namespace Umbraco.Web /// /// public IEnumerable TypedSearch(string term, bool useWildCards = true, string searchProvider = null) - { - var total = 0; - - return TypedSearch(0, 0, out total, term, useWildCards, searchProvider); - } - - /// - /// Searhes content - /// - /// - /// - /// - /// - /// - /// - public IEnumerable 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); + } /// /// Searhes content @@ -468,9 +410,14 @@ namespace Umbraco.Web /// public IEnumerable 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 diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs index 90bc0a436b..d94476b31c 100644 --- a/src/Umbraco.Web/UmbracoHelper.cs +++ b/src/Umbraco.Web/UmbracoHelper.cs @@ -1251,53 +1251,24 @@ namespace Umbraco.Web public IEnumerable TypedSearch(string term, bool useWildCards = true, string searchProvider = null) { return ContentQuery.TypedSearch(term, useWildCards, searchProvider); - } - - /// - /// Searches content - /// - /// - /// - /// - /// - /// + } + + /// + /// Searhes content + /// + /// /// /// - public IEnumerable TypedSearch(int skip, int take, out int totalRecords, string term, bool useWildCards = true, string searchProvider = null) - { - return ContentQuery.TypedSearch(skip, take, out totalRecords, term, useWildCards, searchProvider); - } - - /// - /// Searhes content - /// - /// - /// - /// - /// - /// - /// - public IEnumerable TypedSearch(int skip, int take, out int totalRecords, Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null) + public IEnumerable TypedSearch(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null) { - return ContentQuery.TypedSearch(skip, take, out totalRecords, criteria, searchProvider); - } - - /// - /// Searhes content - /// - /// - /// - /// - public IEnumerable TypedSearch(Examine.SearchCriteria.ISearchCriteria criteria, Examine.Providers.BaseSearchProvider searchProvider = null) - { - return ContentQuery.TypedSearch(criteria, searchProvider); - } - - #endregion - - #region Xml - - public dynamic ToDynamicXml(string xml) + return ContentQuery.TypedSearch(criteria, searchProvider); + } + + #endregion + + #region Xml + + public dynamic ToDynamicXml(string xml) { if (string.IsNullOrWhiteSpace(xml)) return null; var xElement = XElement.Parse(xml); @@ -1468,8 +1439,8 @@ namespace Umbraco.Web /// public IHtmlString Truncate(string html, int length, bool addElipsis, bool treatTagsAsContent) { - return _stringUtilities.Truncate(html, length, addElipsis, treatTagsAsContent); - } + return _stringUtilities.Truncate(html, length, addElipsis, treatTagsAsContent); + } #region Truncate by Words /// @@ -1480,7 +1451,7 @@ namespace Umbraco.Web int length = _stringUtilities.WordsToLength(html, words); return Truncate(html, length, true, false); - } + } /// /// Truncates a string to a given amount of words, can add a elipsis at the end (...). Method checks for open html tags, and makes sure to close them @@ -1510,12 +1481,12 @@ namespace Umbraco.Web int length = _stringUtilities.WordsToLength(html.ToHtmlString(), words); return Truncate(html, length, addElipsis, false); - } + } + #endregion #endregion - #endregion - + #region If - + /// /// If the test is true, the string valueIfTrue will be returned, otherwise the valueIfFalse will be returned. /// From cfd3cc51879875f7de8eb31a9513c5748d839e04 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 8 Nov 2017 19:47:47 +1100 Subject: [PATCH 2/2] OK... maybe that is now required --- src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs index 799c7c966b..f2a04c5f0f 100644 --- a/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs +++ b/src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs @@ -20,8 +20,14 @@ using Umbraco.Web.Templates; namespace Umbraco.Tests.Web { [TestFixture] - public class TemplateUtilitiesTests + public class TemplateUtilitiesTests : BaseUmbracoApplicationTest { + [SetUp] + public void Setup() + { + Udi.ResetUdiTypes(); + } + [TestCase("", "")] [TestCase("hello href=\"{localLink:1234}\" world ", "hello href=\"/my-test-url\" world ")] [TestCase("hello href=\"{localLink:umb://document-type/9931BDE0-AAC3-4BAB-B838-909A7B47570E}\" world ", "hello href=\"/my-test-url\" world ")]