*/
$wgDBtype = "mysql";
/** Search type
- * "MyISAM" for MySQL native full text search, "Tsearch2" for PostgreSQL
- * based search engine
+ * Leave as null to select the default search engine for the
+ * selected database type (eg SearchMySQL4), or set to a class
+ * name to override to a custom search engine.
*/
-$wgSearchType = "MyISAM";
+$wgSearchType = null;
/** Table name prefix */
$wgDBprefix = '';
/** Database schema
/**
* Perform a full text search query and return a result set.
+ * If title searches are not supported or disabled, return null.
*
* @param string $term - Raw search term
- * @param array $namespaces - List of namespaces to search
- * @return ResultWrapper
+ * @return SearchResultSet
* @access public
+ * @abstract
*/
function searchText( $term ) {
- return $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), true ) ) );
+ return null;
}
/**
* Perform a title-only search query and return a result set.
+ * If title searches are not supported or disabled, return null.
*
* @param string $term - Raw search term
- * @param array $namespaces - List of namespaces to search
- * @return ResultWrapper
+ * @return SearchResultSet
* @access public
+ * @abstract
*/
function searchTitle( $term ) {
- return $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), false ) ) );
+ return null;
}
/**
return $arr;
}
- /**
- * Fetch an array of regular expression fragments for matching
- * the search terms as parsed by this engine in a text extract.
- *
- * @return array
- * @access public
- */
- function termMatches() {
- return $this->searchTerms;
- }
-
/**
* Return a 'cleaned up' search string
*
$lc = $this->legalSearchChars();
return trim( preg_replace( "/[^{$lc}]/", " ", $text ) );
}
-
- /**
- * Return a partial WHERE clause to exclude redirects, if so set
- * @return string
- * @access private
- */
- function queryRedirect() {
- if( $this->showRedirects ) {
- return 'AND cur_is_redirect=0';
- } else {
- return '';
- }
- }
-
- /**
- * Return a partial WHERE clause to limit the search to the given namespaces
- * @return string
- * @access private
- */
- function queryNamespaces() {
- $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
- */
- function queryLimit() {
- return $this->db->limitResult( $this->limit, $this->offset );
- }
-
- /**
- * Does not do anything for generic search engine
- * subclasses may define this though
- * @return string
- * @access 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
- */
- function getQuery( $filteredTerm, $fulltext ) {
- return $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
- $this->queryRedirect() . ' ' .
- $this->queryNamespaces() . ' ' .
- $this->queryRanking($filteredTerm, $fulltext) . ' ' .
- $this->queryLimit();
- }
-
/**
* Load up the appropriate search engine class for the currently
* active database backend, and return a configured instance.
*/
function create() {
global $wgDBtype, $wgDBmysql4, $wgSearchType;
- if( $wgDBtype == 'mysql' ) {
+ if( $wgSearchType ) {
+ $class = $wgSearchType;
+ } elseif( $wgDBtype == 'mysql' ) {
if( $wgDBmysql4 ) {
$class = 'SearchMySQL4';
require_once( 'SearchMySQL4.php' );
return $search;
}
+ /**
+ * Create or update the search index record for the given page.
+ * Title and text should be pre-processed.
+ *
+ * @param int $id
+ * @param string $title
+ * @param string $text
+ * @abstract
+ */
+ function update( $id, $title, $text ) {
+ // no-op
+ }
+
+ /**
+ * Update a search index record's title only.
+ * Title should be pre-processed.
+ *
+ * @param int $id
+ * @param string $title
+ * @abstract
+ */
+ function updateTitle( $id, $title ) {
+ // no-op
+ }
+}
+
+class SearchResultSet {
+ /**
+ * Fetch an array of regular expression fragments for matching
+ * the search terms as parsed by this engine in a text extract.
+ *
+ * @return array
+ * @access public
+ * @abstract
+ */
+ function termMatches() {
+ return array();
+ }
+
+ function numRows() {
+ return 0;
+ }
+
+ /**
+ * Return true if results are included in this result set.
+ * @return bool
+ * @abstract
+ */
+ function hasResults() {
+ return false;
+ }
+
+ /**
+ * Some search modes return a total hit count for the query
+ * in the entire article database. This may include pages
+ * in namespaces that would not be matched on the given
+ * settings.
+ *
+ * Return null if no total hits number is supported.
+ *
+ * @return int
+ * @access public
+ */
+ function getTotalHits() {
+ return null;
+ }
+
+ /**
+ * Some search modes return a suggested alternate term if there are
+ * no exact hits. Returns true if there is one on this set.
+ *
+ * @return bool
+ * @access public
+ */
+ function hasSuggestion() {
+ return false;
+ }
+
+ /**
+ * Some search modes return a suggested alternate term if there are
+ * no exact hits. Check hasSuggestion() first.
+ *
+ * @return string
+ * @access public
+ */
+ function getSuggestion() {
+ return '';
+ }
+
+ /**
+ * Fetches next search result, or false.
+ * @return SearchResult
+ * @access public
+ * @abstract
+ */
+ function next() {
+ return false;
+ }
+}
+
+class SearchResult {
+ function SearchResult( $row ) {
+ $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
+ }
+
+ /**
+ * @return Title
+ * @access public
+ */
+ function getTitle() {
+ return $this->mTitle;
+ }
+
+ /**
+ * @return double or null if not supported
+ */
+ function getScore() {
+ return null;
+ }
}
/**
--- /dev/null
+<?php
+# Copyright (C) 2004 Brion Vibber <brion@pobox.com>
+# 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
+# (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.
+# 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
+ */
+
+/** */
+require_once( 'SearchEngine.php' );
+
+class SearchMySQL extends SearchEngine {
+ /**
+ * Perform a full text search query and return a result set.
+ *
+ * @param string $term - Raw search term
+ * @return MySQLSearchResultSet
+ * @access public
+ */
+ function searchText( $term ) {
+ $resultSet = $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), true ) ) );
+ return new MySQLSearchResultSet( $resultSet, $this->searchTerms );
+ }
+
+ /**
+ * Perform a title-only search query and return a result set.
+ *
+ * @param string $term - Raw search term
+ * @return MySQLSearchResultSet
+ * @access public
+ */
+ function searchTitle( $term ) {
+ $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
+ */
+ function queryRedirect() {
+ if( $this->showRedirects ) {
+ return 'AND cur_is_redirect=0';
+ } else {
+ return '';
+ }
+ }
+
+ /**
+ * Return a partial WHERE clause to limit the search to the given namespaces
+ * @return string
+ * @access private
+ */
+ function queryNamespaces() {
+ $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
+ */
+ function queryLimit() {
+ return $this->db->limitResult( $this->limit, $this->offset );
+ }
+
+ /**
+ * Does not do anything for generic search engine
+ * subclasses may define this though
+ * @return string
+ * @access 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
+ */
+ function getQuery( $filteredTerm, $fulltext ) {
+ return $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
+ $this->queryRedirect() . ' ' .
+ $this->queryNamespaces() . ' ' .
+ $this->queryRanking( $filteredTerm, $fulltext ) . ' ' .
+ $this->queryLimit();
+ }
+
+
+ /**
+ * Picks which field to index on, depending on what type of query.
+ * @param bool $fulltext
+ * @return string
+ */
+ function getIndexField( $fulltext ) {
+ return $fulltext ? 'si_text' : 'si_title';
+ }
+
+ /**
+ * 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 string $filteredTerm
+ * @param bool $fulltext
+ * @return string
+ * @access private
+ */
+ function queryMain( $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;
+ }
+
+ /**
+ * Create or update the search index record for the given page.
+ * Title and text should be pre-processed.
+ *
+ * @param int $id
+ * @param string $title
+ * @param string $text
+ */
+ function update( $id, $title, $text ) {
+ $dbw=& wfGetDB( DB_MASTER );
+ $dbw->replace( 'searchindex',
+ array( 'si_page' ),
+ array(
+ 'si_page' => $id,
+ 'si_title' => $title,
+ 'si_text' => $text
+ ), 'SearchMySQL4::update' );
+ }
+
+ /**
+ * Update a search index record's title only.
+ * Title should be pre-processed.
+ *
+ * @param int $id
+ * @param string $title
+ */
+ function updateTitle( $id, $title ) {
+ $dbw =& wfGetDB( DB_MASTER );
+
+ $dbw->update( array( 'searchindex' ),
+ array( 'si_title' => $title ),
+ array( 'si_page' => $id ),
+ 'SearchMySQL4::updateTitle',
+ $dbw->lowPriorityOption() );
+ }
+}
+
+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 ) {
+ return false;
+ } else {
+ return new SearchResult( $row );
+ }
+ }
+}
+
+?>
*/
/** */
-require_once( 'SearchEngine.php' );
+require_once( 'SearchMySQL.php' );
/**
* @package MediaWiki
* @subpackage Search
*/
-class SearchMySQL3 extends SearchEngine {
+class SearchMySQL3 extends SearchMySQL {
function SearchMySQL3( &$db ) {
$this->db =& $db;
}
-
- function getIndexField( $fulltext ) {
- return $fulltext ? 'si_text' : 'si_title';
- }
-
+
function parseQuery( $filteredText, $fulltext ) {
global $wgDBminWordLen, $wgContLang;
return '(' . $cond . ' )';
}
- function queryMain( $filteredTerm, $fulltext ) {
- $match = $this->parseQuery( $filteredTerm, $fulltext );
- $page = $this->db->tableName( 'page' );
- $revision = $this->db->tableName( 'revision' );
- $text = $this->db->tableName( 'text' );
- $searchindex = $this->db->tableName( 'searchindex' );
- return 'SELECT page_id, page_namespace, page_title, old_flags, old_text ' .
- "FROM $page,$revision,$text,$searchindex " .
- 'WHERE page_id=si_page AND page_latest=rev_id AND rev_text_id=old_id AND ' . $match;
- }
-
- function update( $id, $title, $text ) {
- $dbw=& wfGetDB(DB_MASTER);
- $dbw->replace( 'searchindex', array(array('si_page')),
- array(
- 'si_page' => $id,
- 'si_title' => $title,
- 'si_text' => $text
- ), 'SearchMySQL3::update' );
- }
-
- function updateTitle($id,$title) {
- $dbw=& wfGetDB(DB_MASTER);
- $lowpri=$dbw->lowPriorityOption();
- $searchindex = $dbw->tableName( 'searchindex' );
-
- $sql = "UPDATE $lowpri $searchindex SET si_title='" .
- $dbw->strencode( $title ) .
- "' WHERE si_page={$id}";
-
- $dbw->query( $sql, "SearchMySQL3::updateTitle" );
- }
}
?>
* @subpackage Search
*/
-/** */
-require_once( 'SearchEngine.php' );
+require_once( 'SearchMySQL.php' );
/**
* @package MediaWiki
* @subpackage Search
*/
-class SearchMySQL4 extends SearchEngine {
+class SearchMySQL4 extends SearchMySQL {
var $strictMatching = true;
/** @todo document */
$this->db =& $db;
}
- /** @todo document */
- function getIndexField( $fulltext ) {
- return $fulltext ? 'si_text' : 'si_title';
- }
-
/** @todo document */
function parseQuery( $filteredText, $fulltext ) {
global $wgContLang;
$field = $this->getIndexField( $fulltext );
return " MATCH($field) AGAINST('$searchon' IN BOOLEAN MODE) ";
}
-
- /** @todo document */
- function queryMain( $filteredTerm, $fulltext ) {
- $match = $this->parseQuery( $filteredTerm, $fulltext );
- $page = $this->db->tableName( 'page' );
- $revision = $this->db->tableName( 'revision' );
- $text = $this->db->tableName( 'text' );
- $searchindex = $this->db->tableName( 'searchindex' );
- return 'SELECT page_id, page_namespace, page_title, old_flags, old_text ' .
- "FROM $page,$revision,$text,$searchindex " .
- 'WHERE page_id=si_page AND page_latest=rev_id AND rev_text_id=old_id AND ' . $match;
- }
-
- /** @todo document */
- function update( $id, $title, $text ) {
- $dbw=& wfGetDB(DB_MASTER);
- $dbw->replace( 'searchindex', array(array('si_page')),
- array(
- 'si_page' => $id,
- 'si_title' => $title,
- 'si_text' => $text
- ), 'SearchMySQL4::update' );
- }
-
- /** @todo document */
- function updateTitle($id,$title) {
- $dbw =& wfGetDB(DB_MASTER);
- $lowpri = $dbw->lowPriorityOption();
- $searchindex = $dbw->tableName( 'searchindex' );
-
- $sql = "UPDATE $lowpri $searchindex SET si_title='" .
- $dbw->strencode( $title ) .
- "' WHERE si_page={$id}";
-
- $dbw->query( $sql, "SearchMySQL4::updateTitle" );
- }
}
?>
$titleMatches = $search->searchTitle( $term );
$textMatches = $search->searchText( $term );
- $num = $titleMatches->numRows() + $textMatches->numRows();
+ $num = ( $titleMatches ? $titleMatches->numRows() : 0 )
+ + ( $textMatches ? $textMatches->numRows() : 0);
if ( $num >= $this->limit ) {
$top = wfShowingResults( $this->offset, $this->limit );
} else {
$wgOut->addHTML( "<br />{$prevnext}\n" );
}
- global $wgContLang;
- $tm = $wgContLang->convertForSearchResult( $search->termMatches() );
- $terms = implode( '|', $tm );
-
- if( $titleMatches->numRows() ) {
- $wgOut->addWikiText( '==' . wfMsg( 'titlematches' ) . "==\n" );
- $wgOut->addHTML( $this->showMatches( $titleMatches, $terms ) );
- } else {
- $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" );
+ if( $titleMatches ) {
+ if( $titleMatches->numRows() ) {
+ $wgOut->addWikiText( '==' . wfMsg( 'titlematches' ) . "==\n" );
+ $wgOut->addHTML( $this->showMatches( $titleMatches ) );
+ } else {
+ $wgOut->addWikiText( '==' . wfMsg( 'notitlematches' ) . "==\n" );
+ }
}
- if( $textMatches->numRows() ) {
- $wgOut->addWikiText( '==' . wfMsg( 'textmatches' ) . "==\n" );
- $wgOut->addHTML( $this->showMatches( $textMatches, $terms ) );
- } elseif( $num == 0 ) {
- # Don't show the 'no text matches' if we received title matches
- $wgOut->addWikiText( '==' . wfMsg( 'notextmatches' ) . "==\n" );
+ if( $textMatches ) {
+ if( $textMatches->numRows() ) {
+ $wgOut->addWikiText( '==' . wfMsg( 'textmatches' ) . "==\n" );
+ $wgOut->addHTML( $this->showMatches( $textMatches ) );
+ } elseif( $num == 0 ) {
+ # Don't show the 'no text matches' if we received title matches
+ $wgOut->addWikiText( '==' . wfMsg( 'notextmatches' ) . "==\n" );
+ }
}
if ( $num == 0 ) {
}
/**
- * @param ResultWrapper $matches
+ * @param SearchResultSet $matches
* @param string $terms partial regexp for highlighting terms
*/
- function showMatches( &$matches, $terms ) {
+ function showMatches( &$matches ) {
$fname = 'SpecialSearch::showMatches';
wfProfileIn( $fname );
+ global $wgContLang;
+ $tm = $wgContLang->convertForSearchResult( $matches->termMatches() );
+ $terms = implode( '|', $tm );
+
global $wgOut;
$off = $this->offset + 1;
$out = "<ol start='{$off}'>\n";
- while( $row = $matches->fetchObject() ) {
- $out .= $this->showHit( $row, $terms );
+ while( $result = $matches->next() ) {
+ $out .= $this->showHit( $result, $terms );
}
$out .= "</ol>\n";
/**
* Format a single hit result
- * @param object $row
+ * @param SearchResult $result
* @param string $terms partial regexp for highlighting terms
*/
- function showHit( $row, $terms ) {
+ function showHit( $result, $terms ) {
$fname = 'SpecialSearch::showHit';
wfProfileIn( $fname );
global $wgUser, $wgContLang;
- $t = Title::makeTitle( $row->page_namespace, $row->page_title );
+ $t = $result->getTitle();
if( is_null( $t ) ) {
wfProfileOut( $fname );
return "<!-- Broken link in search result -->\n";
$contextchars = $wgUser->getOption( 'contextchars' );
if ( '' == $contextchars ) { $contextchars = 50; }
- $link = $sk->makeKnownLinkObj( $t, '' );
- $text = Revision::getRevisionText( $row );
+ $link = $sk->makeKnownLinkObj( $t );
+ $revision = Revision::newFromTitle( $t );
+ $text = $revision->getText();
$size = wfMsg( 'nbytes', strlen( $text ) );
$lines = explode( "\n", $text );
dépôts / lhc / web / wiklou.git / commitdiff