jenkins-bot has submitted this change and it was merged.
Change subject: Improve suggestion configuration.
......................................................................
Improve suggestion configuration.
This will cause elasticseach to generate more suggestions on the back
end and adds a stronger filter before it sends them back to mediawiki.
Change-Id: If4bc7ed483132f0be0bf03c74679a340c57fae14
---
M CirrusSearch.body.php
M CirrusSearch.php
2 files changed, 23 insertions(+), 3 deletions(-)
Approvals:
Demon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CirrusSearch.body.php b/CirrusSearch.body.php
index f15b497..0b049ab 100644
--- a/CirrusSearch.body.php
+++ b/CirrusSearch.body.php
@@ -146,7 +146,7 @@
public function searchText( $term ) {
wfDebugLog( 'CirrusSearch', "Searching: $term" );
- global $wgCirrusSearchPhraseSuggestMaxErrors;
+ global $wgCirrusSearchPhraseSuggestMaxErrors,
$wgCirrusSearchPhraseSuggestConfidence;
$originalTerm = $term;
@@ -234,14 +234,30 @@
CirrusSearch::PHRASE_TITLE => array(
'phrase' => array(
'field' => 'title.suggest',
- 'max_errors' =>
$wgCirrusSearchPhraseSuggestMaxErrors
+ 'size' => 1,
+ 'max_errors' =>
$wgCirrusSearchPhraseSuggestMaxErrors,
+ 'confidence' =>
$wgCirrusSearchPhraseSuggestConfidence,
+ 'direct_generator' => array(
+ array(
+ 'field' =>
'title.suggest',
+ 'suggest_mode'
=> 'always', // Forces us to generate lots of phrases to try.
+ ),
+ ),
)
),
// TODO redirects here too?
CirrusSearch::PHRASE_TEXT => array(
'phrase' => array(
'field' => 'text.suggest',
- 'max_errors' =>
$wgCirrusSearchPhraseSuggestMaxErrors
+ 'size' => 1,
+ 'max_errors' =>
$wgCirrusSearchPhraseSuggestMaxErrors,
+ 'confidence' =>
$wgCirrusSearchPhraseSuggestConfidence,
+ 'direct_generator' => array(
+ array(
+ 'field' =>
'text.suggest',
+ 'suggest_mode'
=> 'always', // Forces us to generate lots of phrases to try.
+ ),
+ ),
)
)
));
diff --git a/CirrusSearch.php b/CirrusSearch.php
index 2961029..60004f2 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -49,6 +49,10 @@
// See max_errors on
http://www.elasticsearch.org/guide/reference/api/search/suggest/
$wgCirrusSearchPhraseSuggestMaxErrors = 5;
+// Confidence level required to suggest new phrases.
+// See confidence on
http://www.elasticsearch.org/guide/reference/api/search/suggest/
+$wgCirrusSearchPhraseSuggestConfidence = 2.0;
+
// Maximum number of redirects per target page to index.
$wgCirrusSearchIndexedRedirects = 1024;
--
To view, visit https://gerrit.wikimedia.org/r/78311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If4bc7ed483132f0be0bf03c74679a340c57fae14
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <[email protected]>
Gerrit-Reviewer: Demon <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
