X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSearchEngine.php;h=2e83974c8fa15755a43dec0775d3dce1716d37c3;hb=f3fecc6331ff1e47bf00a3af971abac303159c9f;hp=17302253a222fec119d35f144642c4c25aa72d72;hpb=697c3f6b0152694f8c9245bac9294a2cfcce5e1b;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/SearchEngine.php b/includes/SearchEngine.php
index 17302253a2..2e83974c8f 100644
--- a/includes/SearchEngine.php
+++ b/includes/SearchEngine.php
@@ -1,587 +1,251 @@
*+-";
- $this->mUsertext = trim( preg_replace( "/[^{$lc}]/", " ", $text ) );
- $this->mSearchterms = array();
- $this->mStrictMatching = true; # Google-style, add '+' on all terms
- }
-
- function queryNamespaces()
- {
- $namespaces = implode( ",", $this->namespacesToSearch );
- if ($namespaces == "") {
- $namespaces = "0";
- }
- return "AND cur_namespace IN (" . $namespaces . ")";
+ var $limit = 10;
+ var $offset = 0;
+ var $searchTerms = array();
+ var $namespaces = array( 0 );
+ var $showRedirects = false;
+
+ /**
+ * Perform a full text search query and return a result set.
+ *
+ * @param string $term - Raw search term
+ * @param array $namespaces - List of namespaces to search
+ * @return ResultWrapper
+ * @access public
+ */
+ function searchText( $term ) {
+ return $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), true ) ) );
}
- function searchRedirects()
- {
- if ( $this->doSearchRedirects ) {
- return "";
- } else {
- return "AND cur_is_redirect=0 ";
- }
+ /**
+ * Perform a title-only search query and return a result set.
+ *
+ * @param string $term - Raw search term
+ * @param array $namespaces - List of namespaces to search
+ * @return ResultWrapper
+ * @access public
+ */
+ function searchTitle( $term ) {
+ return $this->db->resultObject( $this->db->query( $this->getQuery( $this->filter( $term ), false ) ) );
}
-
- /* private */ function initNamespaceCheckbox( $i )
- {
- global $wgUser, $wgNamespacesToBeSearchedDefault;
-
- if ($wgUser->getID()) {
- // User is logged in so we retrieve his default namespaces
- return $wgUser->getOption( "searchNs".$i );
- } else {
- // User is not logged in so we give him the global default namespaces
- return !empty($wgNamespacesToBeSearchedDefault[ $i ]);
+
+ /**
+ * If an exact title match can be find, or a very slightly close match,
+ * return the title. If no match, returns NULL.
+ *
+ * @param string $term
+ * @return Title
+ * @access private
+ */
+ function getNearMatch( $term ) {
+ # Exact match? No need to look further.
+ $title = Title::newFromText( $term );
+ if ( $title->getNamespace() == NS_SPECIAL || 0 != $title->getArticleID() ) {
+ return $title;
}
- }
-
- # Display the "power search" footer. Does not actually perform the search,
- # that is done by showResults()
- function powersearch()
- {
- global $wgUser, $wgOut, $wgLang, $wgTitle, $wgRequest;
-
- $search = $wgRequest->getText( 'search' );
- $searchx = $wgRequest->getVal( 'searchx' );
- $listredirs = $wgRequest->getVal( 'redirs' );
-
- $ret = wfMsg("powersearchtext"); # Text to be returned
- $tempText = ""; # Temporary text, for substitution into $ret
- if( isset( $_REQUEST["searchx"] ) ) {
- $this->addtoquery["searchx"] = "1";
+ # Now try all lower case (i.e. first letter capitalized)
+ #
+ $title = Title::newFromText( strtolower( $term ) );
+ if ( 0 != $title->getArticleID() ) {
+ return $title;
}
-
- # Do namespace checkboxes
- $namespaces = $wgLang->getNamespaces();
- foreach ( $namespaces as $i => $namespace ) {
- # Skip virtual namespaces
- if ( $i < 0 ) {
- continue;
- }
-
- $formVar = "ns$i";
-
- # Initialise checkboxValues, either from defaults or from
- # a previous invocation
- if ( !isset( $searchx ) ) {
- $checkboxValue = $this->initNamespaceCheckbox( $i );
- } else {
- $checkboxValue = $_REQUEST[$formVar];
- }
-
- $checked = "";
- if ( $checkboxValue == 1 ) {
- $checked = " checked='checked'";
- $this->addtoquery["ns{$i}"] = 1;
- array_push( $this->namespacesToSearch, $i );
- }
- $name = str_replace( "_", " ", $namespaces[$i] );
- if ( "" == $name ) {
- $name = wfMsg( "blanknamespace" );
- }
- if ( $tempText !== "" ) {
- $tempText .= " ";
- }
- $tempText .= "{$name}\n";
+ # Now try capitalized string
+ #
+ $title = Title::newFromText( ucwords( strtolower( $term ) ) );
+ if ( 0 != $title->getArticleID() ) {
+ return $title;
}
- $ret = str_replace ( "$1", $tempText, $ret );
-
- # List redirects checkbox
- $checked = "";
- if ( $listredirs == 1 ) {
- $this->addtoquery["redirs"] = 1;
- $checked = " checked='checked'";
+ # Now try all upper case
+ #
+ $title = Title::newFromText( strtoupper( $term ) );
+ if ( 0 != $title->getArticleID() ) {
+ return $title;
}
- $tempText = "\n";
- $ret = str_replace( "$2", $tempText, $ret );
-
- # Search field
-
- $tempText = "\n";
- $ret = str_replace( "$3", $tempText, $ret );
- # Searchx button
-
- $tempText = "\n";
- $ret = str_replace( "$9", $tempText, $ret );
-
- global $wgScript;
- $ret = "
\n
" . wfMsg( "badquerytext" ) . "
\n" ); - return; - } - list( $limit, $offset ) = wfCheckLimits( 20, "searchlimit" ); - - $searchnamespaces = $this->queryNamespaces(); - $redircond = $this->searchRedirects(); - - if ( $wgDisableTextSearch ) { - $wgOut->addHTML( wfMsg( "searchdisabled" ) ); - $wgOut->addHTML( wfMsg( "googlesearch", htmlspecialchars( $search ), $GLOBALS['wgInputEncoding'] ) ); - } else { - $sql = "SELECT cur_id,cur_namespace,cur_title," . - "cur_text FROM cur,searchindex " . - "WHERE cur_id=si_page AND {$this->mTitlecond} " . - "{$searchnamespaces} {$redircond}" . - "LIMIT {$offset}, {$limit}"; - $res1 = wfQuery( $sql, DB_READ, $fname ); - $num = wfNumRows($res1); - - $sk = $wgUser->getSkin(); - $text = ""; - - $this->parseQuery(); - if ( "" == $this->mTitlecond || "" == $this->mTextcond ) { - $wgOut->addHTML( "" . wfMsg( "badquerytext" ) . "
\n" ); - return; - } - list( $limit, $offset ) = wfCheckLimits( 20, "searchlimit" ); - - $searchnamespaces = $this->queryNamespaces(); - $redircond = $this->searchRedirects(); - $sql = "SELECT cur_id,cur_namespace,cur_title," . - "cur_text FROM cur,searchindex " . - "WHERE cur_id=si_page AND {$this->mTitlecond} " . - "{$searchnamespaces} {$redircond}" . - "LIMIT {$offset}, {$limit}"; - $res1 = wfQuery( $sql, DB_READ, $fname ); - $num = wfNumRows($res1); - - $sql = "SELECT cur_id,cur_namespace,cur_title," . - "cur_text FROM cur,searchindex " . - "WHERE cur_id=si_page AND {$this->mTextcond} " . - "{$searchnamespaces} {$redircond} " . - "LIMIT {$offset}, {$limit}"; - $res2 = wfQuery( $sql, DB_READ, $fname ); - $num = $num + wfNumRows($res2); + function legalSearchChars() { + return "A-Za-z_'0-9\\x80-\\xFF\\-"; + } - if ( $num == $limit ) { - $top = wfShowingResults( $offset, $limit); - } else { - $top = wfShowingResultsNum( $offset, $limit, $num ); - } - $wgOut->addHTML( "{$top}
\n" ); - - # For powersearch - - $a2l = "" ; - $akk = array_keys( $this->addtoquery ) ; - foreach ( $akk AS $ak ) { - $a2l .= "&{$ak}={$this->addtoquery[$ak]}" ; - } - - $sl = wfViewPrevNext( $offset, $limit, "", - "search=" . wfUrlencode( $this->mUsertext ) . $a2l ); - $wgOut->addHTML( "" . wfMsg( "nonefound" ) . "
\n" ); - } - $wgOut->addHTML( "{$sl}
\n" ); - $wgOut->addHTML( $powersearch ); - } + /** + * Make a list of searchable namespaces and their canonical names. + * @return array + * @access public + */ + function searchableNamespaces() { + global $wgContLang; + $arr = array(); + foreach( $wgContLang->getNamespaces() as $ns => $name ) { + if( $ns >= NS_MAIN ) { + $arr[$ns] = $name; + } + } + return $arr; } - - function legalSearchChars() - { - $lc = "A-Za-z_'0-9\\x80-\\xFF\\-"; - return $lc; + + /** + * 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; } - - function parseQuery() - { - global $wgDBminWordLen, $wgLang, $wgDBmysql4; - - if( $wgDBmysql4 ) { - # Use cleaner boolean search if available - return $this->parseQuery4(); - } - - $lc = SearchEngine::legalSearchChars() . "()"; - $q = preg_replace( "/([()])/", " \\1 ", $this->mUsertext ); - $q = preg_replace( "/\\s+/", " ", $q ); - $w = explode( " ", strtolower( trim( $q ) ) ); - - $last = $cond = ""; - foreach ( $w as $word ) { - $word = $wgLang->stripForSearch( $word ); - if ( "and" == $word || "or" == $word || "not" == $word - || "(" == $word || ")" == $word ) { - $cond .= " " . strtoupper( $word ); - $last = ""; - } else if ( strlen( $word ) < $wgDBminWordLen ) { - continue; - } else if ( FulltextStoplist::inList( $word ) ) { - continue; - } else { - if ( "" != $last ) { $cond .= " AND"; } - $cond .= " (MATCH (##field##) AGAINST ('" . - wfStrencode( $word ). "'))"; - $last = $word; - array_push( $this->mSearchterms, "\\b" . $word . "\\b" ); - } - } - if ( 0 == count( $this->mSearchterms ) ) { return; } - - $this->mTitlecond = "(" . str_replace( "##field##", - "si_title", $cond ) . " )"; - - $this->mTextcond = "(" . str_replace( "##field##", - "si_text", $cond ) . " AND (cur_is_redirect=0) )"; + + /** + * Return a 'cleaned up' search string + * + * @return string + * @access public + */ + function filter( $text ) { + $lc = $this->legalSearchChars(); + return trim( preg_replace( "/[^{$lc}]/", " ", $text ) ); } - function parseQuery4() - { - global $wgLang; - $lc = SearchEngine::legalSearchChars(); - $searchon = ""; - $this->mSearchterms = array(); - - # FIXME: This doesn't handle parenthetical expressions. - if( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/', - $this->mUsertext, $m, PREG_SET_ORDER ) ) { - foreach( $m as $terms ) { - if( $searchon !== "" ) $searchon .= " "; - if( $this->mStrictMatching && ($terms[1] == "") ) { - $terms[1] = "+"; - } - $searchon .= $terms[1] . $wgLang->stripForSearch( $terms[2] ); - if( $terms[3] ) { - $regexp = preg_quote( $terms[3] ); - if( $terms[4] ) $regexp .= "[0-9A-Za-z_]+"; - } else { - $regexp = preg_quote( str_replace( '"', '', $terms[2] ) ); - } - $this->mSearchterms[] = $regexp; - } - wfDebug( "Would search with '$searchon'\n" ); - wfDebug( "Match with /\b" . implode( '\b|\b', $this->mSearchterms ) . "\b/\n" ); + /** + * 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 { - wfDebug( "Can't understand search query '$this->mUsertext'\n" ); + return ''; } - - $searchon = wfStrencode( $searchon ); - $this->mTitlecond = " MATCH(si_title) AGAINST('$searchon' IN BOOLEAN MODE)"; - $this->mTextcond = " (MATCH(si_text) AGAINST('$searchon' IN BOOLEAN MODE) AND cur_is_redirect=0)"; } - - function showHit( $row ) - { - global $wgUser, $wgOut; - - $t = Title::makeName( $row->cur_namespace, $row->cur_title ); - $sk = $wgUser->getSkin(); - - $contextlines = $wgUser->getOption( "contextlines" ); - if ( "" == $contextlines ) { $contextlines = 5; } - $contextchars = $wgUser->getOption( "contextchars" ); - if ( "" == $contextchars ) { $contextchars = 50; } - - $link = $sk->makeKnownLink( $t, "" ); - $size = wfMsg( "nbytes", strlen( $row->cur_text ) ); - $wgOut->addHTML( "" . wfMsg("nogomatch", $t->escapeLocalURL( "action=edit" ) ) . "
\n" ); - - # Try a fuzzy title search - $anyhit = false; - global $wgDisableFuzzySearch; - if(! $wgDisableFuzzySearch ){ - foreach( array(NS_MAIN, NS_WP, NS_USER, NS_IMAGE, NS_MEDIAWIKI) as $namespace){ - $anyhit |= SearchEngine::doFuzzyTitleSearch( $search, $namespace ); - } - } - - if( ! $anyhit ){ - return $this->showResults(); - } + + /** + * Return a LIMIT clause to limit results on the query. + * @return string + * @access private + */ + function queryLimit() { + return $this->db->limitResult( $this->limit, $this->offset ); } - /* static */ function doFuzzyTitleSearch( $search, $namespace ){ - global $wgLang, $wgOut; - $sstr = ucfirst($search); - $sstr = str_replace(" ", "_", $sstr); - $fuzzymatches = SearchEngine::fuzzyTitles( $sstr, $namespace ); - $fuzzymatches = array_slice($fuzzymatches, 0, 10); - $slen = strlen( $search ); - $wikitext = ""; - foreach($fuzzymatches as $res){ - $t = str_replace("_", " ", $res[1]); - $tfull = $wgLang->getNsText( $namespace ) . ":$t|$t"; - if( $namespace == NS_MAIN ) - $tfull = "$t"; - $distance = $res[0]; - $closeness = (strlen( $search ) - $distance) / strlen( $search ); - $percent = intval( $closeness * 100 ) . "%"; - $stars = str_repeat("*", ceil(5 * $closeness) ); - $wikitext .= "* [[$tfull]] $percent ($stars)\n"; - } - if( $wikitext ){ - if( $namespace != NS_MAIN ) - $wikitext = "=== " . $wgLang->getNsText( $namespace ) . " ===\n" . $wikitext; - $wgOut->addWikiText( $wikitext ); - return true; - } - return false; + /** + * Does not do anything for generic search engine + * subclasses may define this though + * @return string + * @access private + */ + function queryRanking($filteredTerm,$fulltext) { + return ""; } - - /* static */ function fuzzyTitles( $sstr, $namespace = NS_MAIN ){ - $span = 0.10; // weed on title length before doing levenshtein. - $tolerance = 0.35; // allowed percentage of erronous characters - $slen = strlen($sstr); - $tolerance_count = ceil($tolerance * $slen); - $spanabs = ceil($slen * (1 + $span)) - $slen; - # print "Word: $sstr, len = $slen, range = [$min, $max], tolerance_count = $tolerance_count