* Fixed unclosed <p> tag

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

diff --git a/includes/SearchMySQL3.php b/includes/SearchMySQL3.php
index c8cf8fa..3636045 100644 (file)
--- a/includes/SearchMySQL3.php
+++ b/includes/SearchMySQL3.php
@@ -23,17 +23,18 @@
  * @subpackage Search
  */
 
-require_once( 'SearchEngine.php' );
+/** */
+require_once( 'SearchMySQL.php' );
 
-class SearchMySQL3 extends SearchEngine {
+/**
+ * @package MediaWiki
+ * @subpackage Search
+ */
+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;
                
@@ -67,42 +68,14 @@ class SearchMySQL3 extends SearchEngine {
                        }
                }
                if ( 0 == count( $this->searchTerms ) ) {
-                       return null;
+                       # No searchable terms remaining.
+                       # We have to return a term for the query or we get an SQL error.
+                       return "0";
                }
 
                return '(' . $cond . ' )';
        }
 
-       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 )
-                        ), 'SearchMySQL3::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, "SearchMySQL3::updateTitle" );
-       }
 }
 
 ?>