[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch wiktionary sister search on enwiki to title only

2018-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/405206 )

Change subject: Switch wiktionary sister search on enwiki to title only
..


Switch wiktionary sister search on enwiki to title only

Bug: T185250
Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 20 insertions(+), 10 deletions(-)

Approvals:
  EBernhardson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index e5e45ac..6508e88 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -240,16 +240,8 @@
 // Load other project config via cirrus dump config API
 $wgCirrusSearchFetchConfigFromApi = true;
 
-// Override sister search profiles for specific projects
-$wgCirrusSearchCrossProjectProfiles = [
-   // full text wikivoyage results are often irrelevant, filter the
-   // search with title matches to improve relevance.
-   'voy' => [
-   'ftbuilder' => 'perfield_builder_title_filter',
-   'rescore' => 'wsum_inclinks',
-   ],
-];
-
+// Override sister search settings for specific projects
+$wgCirrusSearchCrossProjectProfiles = $wmgCirrusSearchCrossProjectProfiles;
 $wgCirrusSearchCrossProjectSearchBlackList = 
$wmgCirrusSearchCrossProjectSearchBlackList;
 $wgCirrusSearchCrossProjectShowMultimedia = 
$wmgCirrusSearchCrossProjectShowMultimedia;
 
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 39dccc7..956ccab 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18437,6 +18437,24 @@
'itwikivoyage' => false,
 ],
 
+'wmgCirrusSearchCrossProjectProfiles' => [
+   'default' => [
+   // full text wikivoyage results are often irrelevant, filter the
+   // search with title matches to improve relevance
+   'voy' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+   '+enwiki' => [
+   // T185250
+   'wikt' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+],
+
 'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
'default' => false,
// on wiki boost templates have to high boosts for enwiki

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Switch wiktionary sister search on enwiki to title only

2018-01-18 Thread EBernhardson (Code Review) 
EBernhardson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/405206 )

Change subject: Switch wiktionary sister search on enwiki to title only
..

Switch wiktionary sister search on enwiki to title only

Bug: T185250
Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
---
M wmf-config/CirrusSearch-common.php
M wmf-config/InitialiseSettings.php
2 files changed, 19 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/06/405206/1

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index e5e45ac..572a692 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -241,14 +241,7 @@
 $wgCirrusSearchFetchConfigFromApi = true;
 
 // Override sister search profiles for specific projects
-$wgCirrusSearchCrossProjectProfiles = [
-   // full text wikivoyage results are often irrelevant, filter the
-   // search with title matches to improve relevance.
-   'voy' => [
-   'ftbuilder' => 'perfield_builder_title_filter',
-   'rescore' => 'wsum_inclinks',
-   ],
-];
+$wgCirrusSearchCrossProjectProfiles = $wmgCirrusSearchCrossProjectProfiles
 
 $wgCirrusSearchCrossProjectSearchBlackList = 
$wmgCirrusSearchCrossProjectSearchBlackList;
 $wgCirrusSearchCrossProjectShowMultimedia = 
$wmgCirrusSearchCrossProjectShowMultimedia;
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 39dccc7..2c9b460 100755
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18437,6 +18437,24 @@
'itwikivoyage' => false,
 ],
 
+'wmgCirrusSearchCrossProjectProfiles = [
+   'default' => [
+   // full text wikivoyage results are often irrelevant, filter the
+   // search with title matches to improve relevance
+   'voy' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+   '+enwiki' => [
+   // T185250
+   'wikt' => [
+   'ftbuilder' => 'perfield_builder_title_filter',
+   'rescore' => 'wsum_inclinks',
+   ],
+   ],
+],
+
 'wmgCirrusSearchIgnoreOnWikiBoostTemplates' => [
'default' => false,
// on wiki boost templates have to high boosts for enwiki

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I43ff74472e4cdd2a925cf284905e70c318eb6468
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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