X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSearchMySQL.php;h=f9b71c8ecd408f57dc6ad9a6f047d569ba11e00d;hb=a35b7d2a5e5e695d54ef6cacd9194a35e502c048;hp=407a1c74ef79d14a5ac37fc41e0e397defb5cfb9;hpb=b3ab52afc52aac7de195915525c096b34ed875d9;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/SearchMySQL.php b/includes/SearchMySQL.php index 407a1c74ef..f9b71c8ecd 100644 --- a/includes/SearchMySQL.php +++ b/includes/SearchMySQL.php @@ -1,34 +1,81 @@ # http://www.mediawiki.org/ -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License along # with this program; if not, write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # http://www.gnu.org/copyleft/gpl.html /** - * Search engine hook base class for MySQL. - * Specific bits for MySQL 3 and 4 variants are in child classes. - * @package MediaWiki - * @subpackage Search + * @file + * @ingroup Search */ -/** */ -require_once( 'SearchEngine.php' ); - -/** @package MediaWiki */ +/** + * Search engine hook for MySQL 4+ + * @ingroup Search + */ class SearchMySQL extends SearchEngine { + var $strictMatching = true; + + /** @todo document */ + function __construct( $db ) { + $this->db = $db; + } + + /** @todo document */ + function parseQuery( $filteredText, $fulltext ) { + global $wgContLang; + $lc = SearchEngine::legalSearchChars(); // Minus format chars + $searchon = ''; + $this->searchTerms = array(); + + # FIXME: This doesn't handle parenthetical expressions. + $m = array(); + if( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/', + $filteredText, $m, PREG_SET_ORDER ) ) { + foreach( $m as $terms ) { + if( $searchon !== '' ) $searchon .= ' '; + if( $this->strictMatching && ($terms[1] == '') ) { + $terms[1] = '+'; + } + $searchon .= $terms[1] . $wgContLang->stripForSearch( $terms[2] ); + if( !empty( $terms[3] ) ) { + // Match individual terms in result highlighting... + $regexp = preg_quote( $terms[3], '/' ); + if( $terms[4] ) $regexp .= "[0-9A-Za-z_]+"; + } else { + // Match the quoted term in result highlighting... + $regexp = preg_quote( str_replace( '"', '', $terms[2] ), '/' ); + } + $this->searchTerms[] = $regexp; + } + wfDebug( "Would search with '$searchon'\n" ); + wfDebug( 'Match with /' . implode( '|', $this->searchTerms ) . "/\n" ); + } else { + wfDebug( "Can't understand search query '{$filteredText}'\n" ); + } + + $searchon = $this->db->strencode( $searchon ); + $field = $this->getIndexField( $fulltext ); + return " MATCH($field) AGAINST('$searchon' IN BOOLEAN MODE) "; + } + + public static function legalSearchChars() { + return "\"*" . parent::legalSearchChars(); + } + /** * Perform a full text search query and return a result set. * @@ -52,12 +99,12 @@ class SearchMySQL extends SearchEngine { $resultSet = $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), false ) ) ); return new MySQLSearchResultSet( $resultSet, $this->searchTerms ); } - - + + /** * Return a partial WHERE clause to exclude redirects, if so set * @return string - * @access private + * @private */ function queryRedirect() { if( $this->showRedirects ) { @@ -66,24 +113,26 @@ class SearchMySQL extends SearchEngine { return 'AND page_is_redirect=0'; } } - + /** * Return a partial WHERE clause to limit the search to the given namespaces * @return string - * @access private + * @private */ function queryNamespaces() { + if( is_null($this->namespaces) ) + return ''; # search all $namespaces = implode( ',', $this->namespaces ); if ($namespaces == '') { $namespaces = '0'; } return 'AND page_namespace IN (' . $namespaces . ')'; } - + /** * Return a LIMIT clause to limit results on the query. * @return string - * @access private + * @private */ function queryLimit() { return $this->db->limitResult( '', $this->limit, $this->offset ); @@ -93,18 +142,18 @@ class SearchMySQL extends SearchEngine { * Does not do anything for generic search engine * subclasses may define this though * @return string - * @access private + * @private */ function queryRanking( $filteredTerm, $fulltext ) { return ''; } - + /** * Construct the full SQL query to do the search. * The guts shoulds be constructed in queryMain() * @param string $filteredTerm * @param bool $fulltext - * @access private + * @private */ function getQuery( $filteredTerm, $fulltext ) { return $this->queryMain( $filteredTerm, $fulltext ) . ' ' . @@ -133,7 +182,7 @@ class SearchMySQL extends SearchEngine { * @param string $filteredTerm * @param bool $fulltext * @return string - * @access private + * @private */ function queryMain( $filteredTerm, $fulltext ) { $match = $this->parseQuery( $filteredTerm, $fulltext ); @@ -153,14 +202,14 @@ class SearchMySQL extends SearchEngine { * @param string $text */ function update( $id, $title, $text ) { - $dbw=& wfGetDB( DB_MASTER ); + $dbw = wfGetDB( DB_MASTER ); $dbw->replace( 'searchindex', array( 'si_page' ), array( 'si_page' => $id, 'si_title' => $title, 'si_text' => $text - ), 'SearchMySQL4::update' ); + ), __METHOD__ ); } /** @@ -171,31 +220,33 @@ class SearchMySQL extends SearchEngine { * @param string $title */ function updateTitle( $id, $title ) { - $dbw =& wfGetDB( DB_MASTER ); - + $dbw = wfGetDB( DB_MASTER ); + $dbw->update( 'searchindex', array( 'si_title' => $title ), array( 'si_page' => $id ), - 'SearchMySQL4::updateTitle', + __METHOD__, array( $dbw->lowPriorityOption() ) ); } } -/** @package MediaWiki */ +/** + * @ingroup Search + */ class MySQLSearchResultSet extends SearchResultSet { function MySQLSearchResultSet( $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 ) { @@ -204,6 +255,8 @@ class MySQLSearchResultSet extends SearchResultSet { return new SearchResult( $row ); } } -} -?> + function free() { + $this->mResultSet->free(); + } +}