X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fsearch%2FSearchMssql.php;h=3eef4987685b710558609cd96817a170f4dbef4b;hb=9221f5ffd09b4f7347dbd5e251c96733c1becba1;hp=d92c9c85284f6f3569bff13d17e70dc7f88ec732;hpb=2e09c356789bf7569fdfa219827f488976aa16f0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index d92c9c8528..3eef498768 100644
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -29,31 +29,31 @@ class SearchMssql extends SearchDatabase {
 	/**
 	 * Perform a full text search query and return a result set.
 	 *
-	 * @param string $term raw search term
-	 * @return MssqlSearchResultSet
+	 * @param string $term Raw search term
+	 * @return SqlSearchResultSet
 	 * @access public
 	 */
 	function searchText( $term ) {
 		$resultSet = $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), true ) ) );
-		return new MssqlSearchResultSet( $resultSet, $this->searchTerms );
+		return new SqlSearchResultSet( $resultSet, $this->searchTerms );
 	}
 
 	/**
 	 * Perform a title-only search query and return a result set.
 	 *
-	 * @param string $term raw search term
-	 * @return MssqlSearchResultSet
+	 * @param string $term Raw search term
+	 * @return SqlSearchResultSet
 	 * @access public
 	 */
 	function searchTitle( $term ) {
 		$resultSet = $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), false ) ) );
-		return new MssqlSearchResultSet( $resultSet, $this->searchTerms );
+		return new SqlSearchResultSet( $resultSet, $this->searchTerms );
 	}
 
 	/**
 	 * Return a partial WHERE clause to limit the search to the given namespaces
 	 *
-	 * @return String
+	 * @return string
 	 * @private
 	 */
 	function queryNamespaces() {
@@ -67,9 +67,9 @@ class SearchMssql extends SearchDatabase {
 	/**
 	 * Return a LIMIT clause to limit results on the query.
 	 *
-	 * @param $sql string
+	 * @param string $sql
 	 *
-	 * @return String
+	 * @return string
 	 */
 	function queryLimit( $sql ) {
 		return $this->db->limitResult( $sql, $this->limit, $this->offset );
@@ -79,7 +79,7 @@ class SearchMssql extends SearchDatabase {
 	 * Does not do anything for generic search engine
 	 * subclasses may define this though
 	 *
-	 * @return String
+	 * @return string
 	 */
 	function queryRanking( $filteredTerm, $fulltext ) {
 		return ' ORDER BY ftindex.[RANK] DESC'; // return ' ORDER BY score(1)';
@@ -89,9 +89,9 @@ class SearchMssql extends SearchDatabase {
 	 * Construct the full SQL query to do the search.
 	 * The guts shoulds be constructed in queryMain()
 	 *
-	 * @param $filteredTerm String
-	 * @param $fulltext Boolean
-	 * @return String
+	 * @param string $filteredTerm
+	 * @param bool $fulltext
+	 * @return string
 	 */
 	function getQuery( $filteredTerm, $fulltext ) {
 		return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
@@ -102,7 +102,7 @@ class SearchMssql extends SearchDatabase {
 	/**
 	 * Picks which field to index on, depending on what type of query.
 	 *
-	 * @param $fulltext Boolean
+	 * @param bool $fulltext
 	 * @return string
 	 */
 	function getIndexField( $fulltext ) {
@@ -112,9 +112,9 @@ class SearchMssql extends SearchDatabase {
 	/**
 	 * Get the base part of the search query.
 	 *
-	 * @param $filteredTerm String
-	 * @param $fulltext Boolean
-	 * @return String
+	 * @param string $filteredTerm
+	 * @param bool $fulltext
+	 * @return string
 	 * @private
 	 */
 	function queryMain( $filteredTerm, $fulltext ) {
@@ -165,9 +165,9 @@ class SearchMssql extends SearchDatabase {
 	 * Create or update the search index record for the given page.
 	 * Title and text should be pre-processed.
 	 *
-	 * @param $id Integer
-	 * @param $title String
-	 * @param $text String
+	 * @param int $id
+	 * @param string $title
+	 * @param string $text
 	 * @return bool|ResultWrapper
 	 */
 	function update( $id, $title, $text ) {
@@ -189,8 +189,8 @@ class SearchMssql extends SearchDatabase {
 	 * Update a search index record's title only.
 	 * Title should be pre-processed.
 	 *
-	 * @param $id Integer
-	 * @param $title String
+	 * @param int $id
+	 * @param string $title
 	 * @return bool|ResultWrapper
 	 */
 	function updateTitle( $id, $title ) {
@@ -204,29 +204,3 @@ class SearchMssql extends SearchDatabase {
 		return $this->db->query( $sql, 'SearchMssql::updateTitle' );
 	}
 }
-
-/**
- * @ingroup Search
- */
-class MssqlSearchResultSet extends SearchResultSet {
-	function __construct( $resultSet, $terms ) {
-		$this->mResultSet = $resultSet;
-		$this->mTerms = $terms;
-	}
-
-	function termMatches() {
-		return $this->mTerms;
-	}
-
-	function numRows() {
-		return $this->mResultSet->numRows();
-	}
-
-	function next() {
-		$row = $this->mResultSet->fetchObject();
-		if ( $row === false ) {
-			return false;
-		}
-		return new SearchResult( $row );
-	}
-}