EBernhardson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/401795 )
Change subject: Revert "Add backend support for the new crossproject result
page A/B test"
......................................................................
Revert "Add backend support for the new crossproject result page A/B test"
This test is over, we don't need the ability to request but throw away
interwiki results to estimate recall and such anymore. The related
feature-marker, enable-new-crossproject-page, is removed from core
in the related patch.
This reverts commit b43efa1dbe8d257c6d31a4e350dbcc6d1723e9fb.
Related: I80d8375b
Change-Id: I9a4884386a5c15852af15942ff51de60d9355858
---
M CirrusSearch.php
M includes/CirrusSearch.php
2 files changed, 0 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/95/401795/1
diff --git a/CirrusSearch.php b/CirrusSearch.php
index a2d3461..3357283 100644
--- a/CirrusSearch.php
+++ b/CirrusSearch.php
@@ -1062,22 +1062,6 @@
$wgCirrusSearchCrossProjectProfiles = [];
/**
- * When wgCirrusSearchEnableCrossProjectSearch is true
- * Setting wgCirrusSearchHideCrossProjectResults will
- * tell SpecialSearch to run normally without displaying
- * interwiki results.
- * Useful to report how many results we could have been
- * displayed (For analytics purpose).
- */
-$wgCirrusSearchHideCrossProjectResults = false;
-
-/**
- * Informs SpeciaSearch in core that we want
- * to use the new cross project result page
- */
-$wgCirrusSearchNewCrossProjectPage = false;
-
-/**
* Enables the explore similar feature for search results
* which adds links to related pages (morelike), categories and
* languages beside each search result on the SERP.
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index 40e759b..f41c9b3 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -407,34 +407,19 @@
$iwSearch = new InterwikiSearcher( $this->connection,
$config, $this->namespaces, null, $highlightingConfig );
$iwSearch->setOptionsFromRequest( $this->request );
$interwikiResults = $iwSearch->getInterwikiResults(
$term );
-
if ( $interwikiResults !== null ) {
// If we are dumping we need to convert into an
array that can be appended to
- $recallMetrics = [];
if ( $iwSearch->isReturnRaw() ) {
$result = [ $result ];
}
foreach ( $interwikiResults as $interwiki =>
$interwikiResult ) {
- $recallMetrics[$interwiki] =
"$interwiki:0";
if ( $iwSearch->isReturnRaw() ) {
$result[] = $interwikiResult;
} elseif ( $interwikiResult &&
$interwikiResult->numRows() > 0 ) {
- $recallMetrics[$interwiki] =
"$interwiki:" . $interwikiResult->getTotalHits();
- // Hide the search results, we
are only
- // running the query for
analytic purposes
- if ( $this->config->get(
'CirrusSearchHideCrossProjectResults' ) ) {
- continue;
- }
$result->addInterwikiResults(
$interwikiResult,
SearchResultSet::SECONDARY_RESULTS, $interwiki
);
}
- }
-
$this->extraSearchMetrics['wgCirrusSearchCrossProjectRecall'] = implode( '|',
$recallMetrics );
- if ( $this->config->get(
'CirrusSearchNewCrossProjectPage' ) &&
- !$this->config->get(
'CirrusSearchHideCrossProjectResults' ) ) {
-
$this->features['enable-new-crossproject-page'] = true;
-
$this->features['show-multimedia-search-results'] = $this->config->get(
'CirrusSearchCrossProjectShowMultimedia' );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/401795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a4884386a5c15852af15942ff51de60d9355858
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
