X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fapi%2FApiQuerySearch.php;h=80798a10cd7c0d0ce2d4fabd32ef62bafa4f1268;hb=31680aaddc8ddde150aa5ab2370a019a550f259d;hp=f57d3a30cf5f7381a8e781634313f2e18e453e31;hpb=bbc68cba575acb57b3987e2a43e4bac78a5d39a5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index f57d3a30cf..80798a10cd 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -32,6 +32,10 @@ use MediaWiki\MediaWikiServices;
  * @ingroup API
  */
 class ApiQuerySearch extends ApiQueryGeneratorBase {
+	use SearchApi;
+
+	/** @var array list of api allowed params */
+	private $allowedParams;
 
 	/**
 	 * When $wgSearchType is null, $wgSearchAlternatives[0] is null. Null isn't
@@ -61,8 +65,11 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		global $wgContLang;
 		$params = $this->extractRequestParams();
 
+		if ( isset( $params['backend'] ) && $params['backend'] == self::BACKEND_NULL_PARAM ) {
+			unset( $params['backend'] );
+		}
+
 		// Extract parameters
-		$limit = $params['limit'];
 		$query = $params['search'];
 		$what = $params['what'];
 		$interwiki = $params['interwiki'];
@@ -80,11 +87,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		}
 
 		// Create search engine instance and set options
-		$type = isset( $params['backend'] ) && $params['backend'] != self::BACKEND_NULL_PARAM ?
-			$params['backend'] : null;
-		$search = MediaWikiServices::getInstance()->getSearchEngineFactory()->create( $type );
-		$search->setLimitOffset( $limit + 1, $params['offset'] );
-		$search->setNamespaces( $params['namespace'] );
+		$search = $this->buildSearchEngine( $params );
 		$search->setFeatureData( 'rewrite', (bool)$params['enablerewrites'] );
 
 		$query = $search->transformSearchTerm( $query );
@@ -152,6 +155,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		$titles = [];
 		$count = 0;
 		$result = $matches->next();
+		$limit = $params['limit'];
 
 		while ( $result ) {
 			if ( ++$count > $limit ) {
@@ -301,7 +305,11 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 	}
 
 	public function getAllowedParams() {
-		$params = [
+		if ( $this->allowedParams !== null ) {
+			return $this->allowedParams;
+		}
+
+		$this->allowedParams = [
 			'search' => [
 				ApiBase::PARAM_TYPE => 'string',
 				ApiBase::PARAM_REQUIRED => true
@@ -368,13 +376,31 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 			if ( $alternatives[0] === null ) {
 				$alternatives[0] = self::BACKEND_NULL_PARAM;
 			}
-			$params['backend'] = [
+			$this->allowedParams['backend'] = [
 				ApiBase::PARAM_DFLT => $searchConfig->getSearchType(),
 				ApiBase::PARAM_TYPE => $alternatives,
 			];
+			// @todo: support profile selection when multiple
+			// backends are available. The solution could be to
+			// merge all possible profiles and let ApiBase
+			// subclasses do the check. Making ApiHelp and ApiSandbox
+			// comprehensive might be more difficult.
+		} else {
+			$profileParam = $this->buildProfileApiParam( SearchEngine::FT_QUERY_INDEP_PROFILE_TYPE,
+				'apihelp-query+search-param-qiprofile' );
+			if ( $profileParam ) {
+				$this->allowedParams['qiprofile'] = $profileParam;
+			}
 		}
 
-		return $params;
+		return $this->allowedParams;
+	}
+
+	public function getSearchProfileParams() {
+		if ( isset( $this->getAllowedParams()['qiprofile'] ) ) {
+			return [ SearchEngine::FT_QUERY_INDEP_PROFILE_TYPE => 'qiprofile' ];
+		}
+		return [];
 	}
 
 	protected function getExamplesMessages() {