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; /** 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 ]); diff --git a/src/Solr/Forms/SearchForm.php b/src/Solr/Forms/SearchForm.php index a5a2a91..140d592 100644 --- a/src/Solr/Forms/SearchForm.php +++ b/src/Solr/Forms/SearchForm.php @@ -65,6 +65,10 @@ class SearchForm extends Form $searchTerms = $request->requestVar('Search'); $query = SearchQuery::create()->addSearchTerm($searchTerms); + if ($start = $request->requestVar('start')) { + $query->setStart($start); + } + $params = [ 'spellcheck' => 'true', 'spellcheck.collate' => 'true',