Manybubbles has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/84977


Change subject: Remove no longer required analyzer.
......................................................................

Remove no longer required analyzer.

Change-Id: Ifbbea70a89c77325521625f08382ab2996fc3c57
---
M CirrusSearchAnalysisConfigBuilder.php
M CirrusSearchSearcher.php
2 files changed, 1 insertion(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/77/84977/1

diff --git a/CirrusSearchAnalysisConfigBuilder.php 
b/CirrusSearchAnalysisConfigBuilder.php
index 3538e0e..8e2e077 100644
--- a/CirrusSearchAnalysisConfigBuilder.php
+++ b/CirrusSearchAnalysisConfigBuilder.php
@@ -60,11 +60,6 @@
                                        'tokenizer' => 'prefix',
                                        'filter' => array( 'lowercase' )
                                ),
-                               'prefix_query' => array( // TODO remove this 
after lowercase_keyword is fully deployed
-                                       'type' => 'custom',
-                                       'tokenizer' => 'no_splitting',
-                                       'filter' => array( 'lowercase' )
-                               ),
                                'lowercase_keyword' => array(
                                        'type' => 'custom',
                                        'tokenizer' => 'no_splitting',
@@ -116,8 +111,6 @@
                        );
                        // Add asciifolding to the prefix queries and 
incategory filters
                        $config[ 'analyzer' ][ 'prefix' ][ 'filter' ][] = 
'asciifolding';
-                       // TODO remove prefix_query after lowercase_keyword is 
fully deployed
-                       $config[ 'analyzer' ][ 'prefix_query' ][ 'filter' ][] = 
'asciifolding';
                        $config[ 'analyzer' ][ 'lowercase_keyword' ][ 'filter' 
][] = 'asciifolding';
                        break;
                case 'tr':
diff --git a/CirrusSearchSearcher.php b/CirrusSearchSearcher.php
index ce9f724..44ae9d0 100644
--- a/CirrusSearchSearcher.php
+++ b/CirrusSearchSearcher.php
@@ -87,7 +87,7 @@
                $match = new \Elastica\Query\Match();
                $match->setField( 'title.prefix', array(
                        'query' => substr( $search, 0, self::MAX_PREFIX_SEARCH 
),
-                       'analyzer' => 'prefix_query'  // TODO switch this to 
lowercase_keyword after the it is fully deployed
+                       'analyzer' => 'lowercase_keyword',
                ) );
                $this->filters[] = new \Elastica\Filter\Query( $match );
                $this->description = "prefix search for '$search'";

-- 
To view, visit https://gerrit.wikimedia.org/r/84977
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbbea70a89c77325521625f08382ab2996fc3c57
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Manybubbles <never...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to