[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Enable ICU folding for en, fr and greek by default

2016-12-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Enable ICU folding for en, fr and greek by default
..


Enable ICU folding for en, fr and greek by default

Bug: T146402
Change-Id: I2670d4130db351fc6b8f7c84172a8c9c6d07a181
---
M includes/Maintenance/AnalysisConfigBuilder.php
M tests/unit/Maintenance/AnalysisConfigBuilderTest.php
2 files changed, 15 insertions(+), 1 deletion(-)

Approvals:
  Cindy-the-browser-test-bot: Looks good to me, but someone else must approve
  Tjones: Looks good to me, approved
  EBernhardson: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/includes/Maintenance/AnalysisConfigBuilder.php 
b/includes/Maintenance/AnalysisConfigBuilder.php
index 831d34a..00aec8f 100644
--- a/includes/Maintenance/AnalysisConfigBuilder.php
+++ b/includes/Maintenance/AnalysisConfigBuilder.php
@@ -909,7 +909,14 @@
 * @var bool[] indexed by language code, languages where ICU folding
 * can be enabled by default
 */
-   private $languagesWithIcuFolding = [];
+   private $languagesWithIcuFolding = [
+   'el' => true,
+   'en' => true,
+   'en-ca' => true,
+   'en-gb' => true,
+   'simple' => true,
+   'fr' => true,
+   ];
 
/**
 * @var bool[] indexed by language code, languages where ICU 
tokenization
diff --git a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php 
b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
index f464a45..b982dbd 100644
--- a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
+++ b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
@@ -30,6 +30,13 @@
public function testICUFolding( array $input, array $expected ) {
$config = new HashSearchConfig( ['CirrusSearchUseIcuFolding' => 
'yes' ] );
$plugins = ['extra', 'analysis-icu'];
+   $builder = new AnalysisConfigBuilder( 'unknown_language', 
$plugins, $config );
+   $result = $builder->enableICUFolding( $input );
+   $this->assertEquals( $expected['analyzer'], $result['analyzer'] 
);
+
+   // Test default
+   $config = new HashSearchConfig( ['CirrusSearchUseIcuFolding' => 
'default' ] );
+   $plugins = ['extra', 'analysis-icu'];
$builder = new AnalysisConfigBuilder( 'en', $plugins, $config );
$result = $builder->enableICUFolding( $input );
$this->assertEquals( $expected['analyzer'], $result['analyzer'] 
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2670d4130db351fc6b8f7c84172a8c9c6d07a181
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 
Gerrit-Reviewer: Cindy-the-browser-test-bot 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Manybubbles 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Enable ICU folding for en, fr and greek by default

2016-10-03 Thread DCausse (Code Review) 
DCausse has uploaded a new change for review.

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

Change subject: Enable ICU folding for en, fr and greek by default
..

Enable ICU folding for en, fr and greek by default

Bug: T146402
Change-Id: I2670d4130db351fc6b8f7c84172a8c9c6d07a181
---
M includes/Maintenance/AnalysisConfigBuilder.php
M tests/jenkins/FullyFeaturedConfig.php
M tests/unit/Maintenance/AnalysisConfigBuilderTest.php
3 files changed, 15 insertions(+), 2 deletions(-)


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

diff --git a/includes/Maintenance/AnalysisConfigBuilder.php 
b/includes/Maintenance/AnalysisConfigBuilder.php
index e88377f..41ed514 100644
--- a/includes/Maintenance/AnalysisConfigBuilder.php
+++ b/includes/Maintenance/AnalysisConfigBuilder.php
@@ -797,7 +797,14 @@
 * @var bool[] indexed by language code, languages where ICU folding
 * can be enabled by default
 */
-   private $languagesWithIcuFolding = [];
+   private $languagesWithIcuFolding = [
+   'el' => true,
+   'en' => true,
+   'en-ca' => true,
+   'en-gb' => true,
+   'simple' => true,
+   'fr' => true,
+   ];
 
/**
 * @var array[]
diff --git a/tests/jenkins/FullyFeaturedConfig.php 
b/tests/jenkins/FullyFeaturedConfig.php
index 524127d..b1ff838 100644
--- a/tests/jenkins/FullyFeaturedConfig.php
+++ b/tests/jenkins/FullyFeaturedConfig.php
@@ -32,7 +32,6 @@
 $wgCirrusSearchWikimediaExtraPlugin[ 'super_detect_noop' ] = true;
 $wgCirrusSearchWikimediaExtraPlugin[ 'id_hash_mod_filter' ] = true;
 $wgCirrusSearchWikimediaExtraPlugin[ 'documentVersion' ] = true;
-$wgCirrusSearchUseIcuFolding = 'yes';
 // Test ICU folding filter
 // see full_text_api.feature: Searching without accents finds results with 
accents
 $wgCirrusSearchICUFoldingUnicodeSetFilter = '[^йЙ]';
diff --git a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php 
b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
index 2715805..b98dc07 100644
--- a/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
+++ b/tests/unit/Maintenance/AnalysisConfigBuilderTest.php
@@ -28,6 +28,13 @@
public function testICUFolding( array $input, array $expected ) {
$config = new HashSearchConfig( ['CirrusSearchUseIcuFolding' => 
'yes' ] );
$plugins = ['extra', 'analysis-icu'];
+   $builder = new AnalysisConfigBuilder( 'unknown_language', 
$plugins, $config );
+   $result = $builder->enableICUFolding( $input );
+   $this->assertEquals( $expected['analyzer'], $result['analyzer'] 
);
+
+   // Test default
+   $config = new HashSearchConfig( ['CirrusSearchUseIcuFolding' => 
'default' ] );
+   $plugins = ['extra', 'analysis-icu'];
$builder = new AnalysisConfigBuilder( 'en', $plugins, $config );
$result = $builder->enableICUFolding( $input );
$this->assertEquals( $expected['analyzer'], $result['analyzer'] 
);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2670d4130db351fc6b8f7c84172a8c9c6d07a181
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 

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