tonyair
/
silverstripe-fulltextsearch
mirror of https://github.com/silverstripe/silverstripe-fulltextsearch
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '3.3'

This commit is contained in:
Dylan Wagstaff 2018-10-17 12:10:53 +13:00
parent 7ee362a5c7 ba9cfcc652
commit f89818909a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Search/Variants/SearchVariant.php
View File

@ -6,6 +6,7 @@ use ReflectionClass;
use SilverStripe\Core\ClassInfo; use SilverStripe\Core\ClassInfo;
use SilverStripe\Core\Config\Configurable; use SilverStripe\Core\Config\Configurable;
use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex; use SilverStripe\FullTextSearch\Search\Indexes\SearchIndex;
use SilverStripe\FullTextSearch\Search\Queries\SearchQuery;
use SilverStripe\FullTextSearch\Utils\CombinationsArrayIterator; use SilverStripe\FullTextSearch\Utils\CombinationsArrayIterator;
/** /**

2
src/Search/Variants/SearchVariantVersioned.php
View File

@ -53,7 +53,7 @@ class SearchVariantVersioned extends SearchVariant
public function alterQuery($query, $index) public function alterQuery($query, $index)
{ {
$query->filter('_versionedstage', [ $query->addFilter('_versionedstage', [
$this->currentState(), $this->currentState(),
SearchQuery::$missing SearchQuery::$missing
]); ]);

4
src/Solr/Forms/SearchForm.php
View File

@ -65,6 +65,10 @@ class SearchForm extends Form
$searchTerms = $request->requestVar('Search'); $searchTerms = $request->requestVar('Search');
$query = SearchQuery::create()->addSearchTerm($searchTerms); $query = SearchQuery::create()->addSearchTerm($searchTerms);
if ($start = $request->requestVar('start')) {
$query->setStart($start);
}
$params = [ $params = [
'spellcheck' => 'true', 'spellcheck' => 'true',
'spellcheck.collate' => 'true', 'spellcheck.collate' => 'true',