Handle nested li in ol or ul. That happens when someone use something like:

[lhc/web/wiklou.git] / includes / SearchMySQL4.php

diff --git a/includes/SearchMySQL4.php b/includes/SearchMySQL4.php
index 5e97945..59f1bbe 100644 (file)
--- a/includes/SearchMySQL4.php
+++ b/includes/SearchMySQL4.php
@@ -1,20 +1,20 @@
 <?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 
+# 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
 
 /**
@@ -23,19 +23,21 @@
  * @subpackage Search
  */
 
-require_once( 'SearchEngine.php' );
+require_once( 'SearchMySQL.php' );
 
-class SearchMySQL4 extends SearchEngine {
-       var $strictMatching = false;
-       
+/**
+ * @package MediaWiki
+ * @subpackage Search
+ */
+class SearchMySQL4 extends SearchMySQL {
+       var $strictMatching = true;
+
+       /** @todo document */
        function SearchMySQL4( &$db ) {
                $this->db =& $db;
        }
-       
-       function getIndexField( $fulltext ) {
-               return $fulltext ? 'si_text' : 'si_title';
-       }
 
+       /** @todo document */
        function parseQuery( $filteredText, $fulltext ) {
                global $wgContLang;
                $lc = SearchEngine::legalSearchChars();
@@ -62,45 +64,12 @@ class SearchMySQL4 extends SearchEngine {
                        wfDebug( "Would search with '$searchon'\n" );
                        wfDebug( "Match with /\b" . implode( '\b|\b', $this->searchTerms ) . "\b/\n" );
                } else {
-                       wfDebug( "Can't understand search query '{$this->filteredText}'\n" );
+                       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) ";
        }
-
-       function queryMain( $filteredTerm, $fulltext ) {
-               $match = $this->parseQuery( $filteredTerm, $fulltext );
-               $cur = $this->db->tableName( 'cur' );
-               $searchindex = $this->db->tableName( 'searchindex' );
-               return 'SELECT cur_id, cur_namespace, cur_title, cur_text ' .
-                       "FROM $cur,$searchindex " .
-                       'WHERE cur_id=si_page AND ' . $match;
-       }
-
-        function update( $id, $title, $text ) {
-                $dbw=& wfGetDB(DB_MASTER);
-                $dbw->replace( 'searchindex', array(array('si_page')),
-                        array(
-                                'si_page' => $id,
-                                'si_title' => $dbw->strencode($title),
-                                'si_text' => $dbw->strencode( $text )
-                        ), 'SearchMySQL4::update' );
-        }
-
-        function updateTitle($id,$title) {
-                $dbw=& wfGetDB(DB_MASTER);
-                $lowpri=$dbw->lowPriorityOption();
-                $searchindex = $dbw->tableName( 'searchindex' );
-
-                $sql = "UPDATE $lowpri $searchindex SET si_title='" .
-                          $db->strencode( $title ) .
-                          "' WHERE si_page={$id}";
-
-                $dbw->query( $sql, "SearchMySQL4::updateTitle" );
-        }
-
 }
-
 ?>