From f1f7b15569ba56a27b8c71ab8dd5b35873276aa5 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Thu, 2 Aug 2018 11:32:03 +1200 Subject: [PATCH 1/5] FIX Add missing namespace import from alterQuery's PHPDoc block --- src/Search/Variants/SearchVariant.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Search/Variants/SearchVariant.php b/src/Search/Variants/SearchVariant.php index 7a6c9b1..a7c5756 100644 --- a/src/Search/Variants/SearchVariant.php +++ b/src/Search/Variants/SearchVariant.php @@ -6,6 +6,7 @@ use ReflectionClass; use SilverStripe\Core\ClassInfo; use SilverStripe\Core\Config\Configurable; use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex; +use SilverStripe\FullTextSearch\Search\Queries\SearchQuery; use SilverStripe\FullTextSearch\Utils\CombinationsArrayIterator; /** From 393d50c85882a410749469aee0400a22a195ef0d Mon Sep 17 00:00:00 2001 From: Guy Marriott Date: Fri, 24 Aug 2018 10:12:18 +1200 Subject: [PATCH 2/5] FIX Removing last usage of depreacted method --- src/Search/Variants/SearchVariantVersioned.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Search/Variants/SearchVariantVersioned.php b/src/Search/Variants/SearchVariantVersioned.php index 2c60659..dea5f1e 100644 --- a/src/Search/Variants/SearchVariantVersioned.php +++ b/src/Search/Variants/SearchVariantVersioned.php @@ -53,7 +53,7 @@ class SearchVariantVersioned extends SearchVariant public function alterQuery($query, $index) { - $query->filter('_versionedstage', [ + $query->addFilter('_versionedstage', [ $this->currentState(), SearchQuery::$missing ]); From 4e543ec2b66c05ea1142ae74c53da087737574f8 Mon Sep 17 00:00:00 2001 From: Sander Hagenaars Date: Tue, 28 Aug 2018 08:41:43 +0200 Subject: [PATCH 3/5] fix missing pagination in search results --- src/Solr/Forms/SearchForm.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Solr/Forms/SearchForm.php b/src/Solr/Forms/SearchForm.php index a5a2a91..1858e9a 100644 --- a/src/Solr/Forms/SearchForm.php +++ b/src/Solr/Forms/SearchForm.php @@ -63,7 +63,10 @@ class SearchForm extends Form $request = $this->getRequestHandler()->getRequest(); $searchTerms = $request->requestVar('Search'); - $query = SearchQuery::create()->addSearchTerm($searchTerms); + // for pagination + $start = $request->requestVar('start'); + + $query = SearchQuery::create()->addSearchTerm($searchTerms)->setStart($start); $params = [ 'spellcheck' => 'true', From f703559d6552d92cf1279e7446dd1b6a6f9a8891 Mon Sep 17 00:00:00 2001 From: Sander Hagenaars Date: Wed, 29 Aug 2018 09:50:37 +0200 Subject: [PATCH 4/5] conditional for adding start variable to results --- src/Solr/Forms/SearchForm.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Solr/Forms/SearchForm.php b/src/Solr/Forms/SearchForm.php index 1858e9a..a580e37 100644 --- a/src/Solr/Forms/SearchForm.php +++ b/src/Solr/Forms/SearchForm.php @@ -63,10 +63,11 @@ class SearchForm extends Form $request = $this->getRequestHandler()->getRequest(); $searchTerms = $request->requestVar('Search'); - // for pagination - $start = $request->requestVar('start'); + $query = SearchQuery::create()->addSearchTerm($searchTerms); - $query = SearchQuery::create()->addSearchTerm($searchTerms)->setStart($start); + if($start = $request->requestVar('start')){ + $query->setStart($start); + } $params = [ 'spellcheck' => 'true', From ef7ff75035d0a7019f1ade9286cdf3ae5ef4a6c2 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 7 Sep 2018 11:47:34 +0200 Subject: [PATCH 5/5] Update code for PSR-2 compliance --- src/Solr/Forms/SearchForm.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Solr/Forms/SearchForm.php b/src/Solr/Forms/SearchForm.php index a580e37..140d592 100644 --- a/src/Solr/Forms/SearchForm.php +++ b/src/Solr/Forms/SearchForm.php @@ -65,7 +65,7 @@ class SearchForm extends Form $searchTerms = $request->requestVar('Search'); $query = SearchQuery::create()->addSearchTerm($searchTerms); - if($start = $request->requestVar('start')){ + if ($start = $request->requestVar('start')) { $query->setStart($start); }