From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/search/SearchMySQL.php | 190 ++++++++++++++++++++++++---------------- 1 file changed, 115 insertions(+), 75 deletions(-) (limited to 'includes/search/SearchMySQL.php') diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php index b92682ad..c52c9e5b 100644 --- a/includes/search/SearchMySQL.php +++ b/includes/search/SearchMySQL.php @@ -40,9 +40,14 @@ class SearchMySQL extends SearchEngine { parent::__construct( $db ); } - /** - * Parse the user's query and transform it into an SQL fragment which will + /** + * Parse the user's query and transform it into an SQL fragment which will * become part of a WHERE clause + * + * @param $filteredText string + * @param $fullText string + * + * @return string */ function parseQuery( $filteredText, $fulltext ) { global $wgContLang; @@ -50,13 +55,13 @@ class SearchMySQL extends SearchEngine { $searchon = ''; $this->searchTerms = array(); - # FIXME: This doesn't handle parenthetical expressions. + # @todo FIXME: This doesn't handle parenthetical expressions. $m = array(); if( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/', $filteredText, $m, PREG_SET_ORDER ) ) { foreach( $m as $bits ) { @list( /* all */, $modifier, $term, $nonQuoted, $wildcard ) = $bits; - + if( $nonQuoted != '' ) { $term = $nonQuoted; $quote = ''; @@ -64,13 +69,13 @@ class SearchMySQL extends SearchEngine { $term = str_replace( '"', '', $term ); $quote = '"'; } - + if( $searchon !== '' ) $searchon .= ' '; if( $this->strictMatching && ($modifier == '') ) { // If we leave this out, boolean op defaults to OR which is rarely helpful. $modifier = '+'; } - + // Some languages such as Serbian store the input form in the search index, // so we may need to search for matches in multiple writing system variants. $convertedVariants = $wgContLang->autoConvertToAllVariants( $term ); @@ -79,7 +84,7 @@ class SearchMySQL extends SearchEngine { } else { $variants = array( $term ); } - + // The low-level search index does some processing on input to work // around problems with minimum lengths and encoding in MySQL's // fulltext engine. @@ -87,12 +92,12 @@ class SearchMySQL extends SearchEngine { $strippedVariants = array_map( array( $wgContLang, 'normalizeForSearch' ), $variants ); - + // Some languages such as Chinese force all variants to a canonical // form when stripping to the low-level search index, so to be sure // let's check our variants list for unique items after stripping. $strippedVariants = array_unique( $strippedVariants ); - + $searchon .= $modifier; if( count( $strippedVariants) > 1 ) $searchon .= '('; @@ -108,7 +113,7 @@ class SearchMySQL extends SearchEngine { } if( count( $strippedVariants) > 1 ) $searchon .= ')'; - + // Match individual terms or quoted phrase in result highlighting... // Note that variants will be introduced in a later stage for highlighting! $regexp = $this->regexTerm( $term, $wildcard ); @@ -124,10 +129,10 @@ class SearchMySQL extends SearchEngine { $field = $this->getIndexField( $fulltext ); return " MATCH($field) AGAINST('$searchon' IN BOOLEAN MODE) "; } - + function regexTerm( $string, $wildcard ) { global $wgContLang; - + $regex = preg_quote( $string, '/' ); if( $wgContLang->hasWordBreaks() ) { if( $wildcard ) { @@ -167,85 +172,112 @@ class SearchMySQL extends SearchEngine { function searchTitle( $term ) { return $this->searchInternal( $term, false ); } - + protected function searchInternal( $term, $fulltext ) { global $wgCountTotalSearchHits; - + + // This seems out of place, why is this called with empty term? + if ( trim( $term ) === '' ) return null; + $filteredTerm = $this->filter( $term ); - $resultSet = $this->db->query( $this->getQuery( $filteredTerm, $fulltext ) ); - + $query = $this->getQuery( $filteredTerm, $fulltext ); + $resultSet = $this->db->select( + $query['tables'], $query['fields'], $query['conds'], + __METHOD__, $query['options'], $query['joins'] + ); + $total = null; if( $wgCountTotalSearchHits ) { - $totalResult = $this->db->query( $this->getCountQuery( $filteredTerm, $fulltext ) ); + $query = $this->getCountQuery( $filteredTerm, $fulltext ); + $totalResult = $this->db->select( + $query['tables'], $query['fields'], $query['conds'], + __METHOD__, $query['options'], $query['joins'] + ); + $row = $totalResult->fetchObject(); if( $row ) { $total = intval( $row->c ); } $totalResult->free(); } - + return new MySQLSearchResultSet( $resultSet, $this->searchTerms, $total ); } - - /** - * Return a partial WHERE clause to exclude redirects, if so set - * @return String - */ - function queryRedirect() { - if( $this->showRedirects ) { - return ''; - } else { - return 'AND page_is_redirect=0'; + public function supports( $feature ) { + switch( $feature ) { + case 'list-redirects': + case 'title-suffix-filter': + return true; + default: + return false; } } /** - * Return a partial WHERE clause to limit the search to the given namespaces - * @return String + * Add special conditions + * @param $query Array + * @since 1.18 */ - function queryNamespaces() { - if( is_null($this->namespaces) ) - return ''; # search all - if ( !count( $this->namespaces ) ) { - $namespaces = '0'; - } else { - $namespaces = $this->db->makeList( $this->namespaces ); + protected function queryFeatures( &$query ) { + foreach ( $this->features as $feature => $value ) { + if ( $feature === 'list-redirects' && !$value ) { + $query['conds']['page_is_redirect'] = 0; + } elseif( $feature === 'title-suffix-filter' && $value ) { + $query['conds'][] = 'page_title' . $this->db->buildLike( $this->db->anyString(), $value ); + } } - return 'AND page_namespace IN (' . $namespaces . ')'; } /** - * Return a LIMIT clause to limit results on the query. - * @return String + * Add namespace conditions + * @param $query Array + * @since 1.18 (changed) */ - function queryLimit() { - return $this->db->limitResult( '', $this->limit, $this->offset ); + function queryNamespaces( &$query ) { + if ( is_array( $this->namespaces ) ) { + if ( count( $this->namespaces ) === 0 ) { + $this->namespaces[] = '0'; + } + $query['conds']['page_namespace'] = $this->namespaces; + } } /** - * Does not do anything for generic search engine - * subclasses may define this though - * @return String + * Add limit options + * @param $query Array + * @since 1.18 */ - function queryRanking( $filteredTerm, $fulltext ) { - return ''; + protected function limitResult( &$query ) { + $query['options']['LIMIT'] = $this->limit; + $query['options']['OFFSET'] = $this->offset; } /** - * Construct the full SQL query to do the search. + * Construct the SQL query to do the search. * The guts shoulds be constructed in queryMain() * @param $filteredTerm String * @param $fulltext Boolean + * @return Array + * @since 1.18 (changed) */ function getQuery( $filteredTerm, $fulltext ) { - return $this->queryMain( $filteredTerm, $fulltext ) . ' ' . - $this->queryRedirect() . ' ' . - $this->queryNamespaces() . ' ' . - $this->queryRanking( $filteredTerm, $fulltext ) . ' ' . - $this->queryLimit(); + $query = array( + 'tables' => array(), + 'fields' => array(), + 'conds' => array(), + 'options' => array(), + 'joins' => array(), + ); + + $this->queryMain( $query, $filteredTerm, $fulltext ); + $this->queryFeatures( $query ); + $this->queryNamespaces( $query ); + $this->limitResult( $query ); + + return $query; } - + /** * Picks which field to index on, depending on what type of query. * @param $fulltext Boolean @@ -257,32 +289,40 @@ class SearchMySQL extends SearchEngine { /** * Get the base part of the search query. - * The actual match syntax will depend on the server - * version; MySQL 3 and MySQL 4 have different capabilities - * in their fulltext search indexes. * * @param $filteredTerm String * @param $fulltext Boolean - * @return String + * @since 1.18 (changed) */ - function queryMain( $filteredTerm, $fulltext ) { + function queryMain( &$query, $filteredTerm, $fulltext ) { $match = $this->parseQuery( $filteredTerm, $fulltext ); - $page = $this->db->tableName( 'page' ); - $searchindex = $this->db->tableName( 'searchindex' ); - return 'SELECT page_id, page_namespace, page_title ' . - "FROM $page,$searchindex " . - 'WHERE page_id=si_page AND ' . $match; + $query['tables'][] = 'page'; + $query['tables'][] = 'searchindex'; + $query['fields'][] = 'page_id'; + $query['fields'][] = 'page_namespace'; + $query['fields'][] = 'page_title'; + $query['conds'][] = 'page_id=si_page'; + $query['conds'][] = $match; } + /** + * @since 1.18 (changed) + */ function getCountQuery( $filteredTerm, $fulltext ) { $match = $this->parseQuery( $filteredTerm, $fulltext ); - $page = $this->db->tableName( 'page' ); - $searchindex = $this->db->tableName( 'searchindex' ); - return "SELECT COUNT(*) AS c " . - "FROM $page,$searchindex " . - 'WHERE page_id=si_page AND ' . $match . - $this->queryRedirect() . ' ' . - $this->queryNamespaces(); + + $query = array( + 'tables' => array( 'page', 'searchindex' ), + 'fields' => array( 'COUNT(*) as c' ), + 'conds' => array( 'page_id=si_page', $match ), + 'options' => array(), + 'joins' => array(), + ); + + $this->queryFeatures( $query ); + $this->queryNamespaces( $query ); + + return $query; } /** @@ -311,7 +351,7 @@ class SearchMySQL extends SearchEngine { * @param $id Integer * @param $title String */ - function updateTitle( $id, $title ) { + function updateTitle( $id, $title ) { $dbw = wfGetDB( DB_MASTER ); $dbw->update( 'searchindex', @@ -329,7 +369,7 @@ class SearchMySQL extends SearchEngine { global $wgContLang; wfProfileIn( __METHOD__ ); - + $out = parent::normalizeText( $string ); // MySQL fulltext index doesn't grok utf-8, so we @@ -363,7 +403,7 @@ class SearchMySQL extends SearchEngine { $out ); wfProfileOut( __METHOD__ ); - + return $out; } @@ -379,7 +419,7 @@ class SearchMySQL extends SearchEngine { /** * Check MySQL server's ft_min_word_len setting so we know * if we need to pad short words... - * + * * @return int */ protected function minSearchLength() { -- cgit v1.2.3-54-g00ecf