(bug 7098) Add an option to disable/enable sending of HTTP ETag headers,

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

diff --git a/includes/SearchTsearch2.php b/includes/SearchTsearch2.php
index 90c900e..a8f354b 100644 (file)
--- a/includes/SearchTsearch2.php
+++ b/includes/SearchTsearch2.php
@@ -14,7 +14,7 @@
 #
 # 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,9 +23,6 @@
  * @subpackage Search
  */
 
-/** */
-require_once( 'SearchEngine.php' );
-
 /**
  * @todo document
  * @package MediaWiki
@@ -33,13 +30,12 @@ require_once( 'SearchEngine.php' );
  */
 class SearchTsearch2 extends SearchEngine {
        var $strictMatching = false;
-       
+
        function SearchTsearch2( &$db ) {
                $this->db =& $db;
-               $this->db->setSchema('tsearch');
                $this->mRanking = true;
        }
-       
+
        function getIndexField( $fulltext ) {
                return $fulltext ? 'si_text' : 'si_title';
        }
@@ -72,7 +68,7 @@ class SearchTsearch2 extends SearchEngine {
                } else {
                        wfDebug( "Can't understand search query '{$this->filteredText}'\n" );
                }
-               
+
                $searchon = preg_replace('/(\s+)/','&',$searchon);
                $searchon = $this->db->strencode( $searchon );
                return $searchon;
@@ -86,7 +82,7 @@ class SearchTsearch2 extends SearchEngine {
                else
                        return "";
        }
-               
+
 
        function queryMain( $filteredTerm, $fulltext ) {
                $match = $this->parseQuery( $filteredTerm, $fulltext );
@@ -99,8 +95,8 @@ class SearchTsearch2 extends SearchEngine {
                        " $field @@ to_tsquery ('$match') " ;
        }
 
-        function update( $id, $title, $text ) {
-                $dbw=& wfGetDB(DB_MASTER);
+       function update( $id, $title, $text ) {
+               $dbw=& wfGetDB(DB_MASTER);
                $searchindex = $dbw->tableName( 'searchindex' );
                $sql = "DELETE FROM $searchindex WHERE si_page={$id}";
                $dbw->query($sql,"SearchTsearch2:update");
@@ -110,17 +106,17 @@ class SearchTsearch2 extends SearchEngine {
                                "'),to_tsvector('".
                                $dbw->strencode( $text)."')) ";
                $dbw->query($sql,"SearchTsearch2:update");
-        }
+       }
 
-        function updateTitle($id,$title) {
-                $dbw=& wfGetDB(DB_MASTER);
-                $searchindex = $dbw->tableName( 'searchindex' );
-                $sql = "UPDATE $searchindex SET si_title=to_tsvector('" .
-                          $db->strencode( $title ) .
-                          "') WHERE si_page={$id}";
+       function updateTitle($id,$title) {
+               $dbw=& wfGetDB(DB_MASTER);
+               $searchindex = $dbw->tableName( 'searchindex' );
+               $sql = "UPDATE $searchindex SET si_title=to_tsvector('" .
+                         $db->strencode( $title ) .
+                         "') WHERE si_page={$id}";
 
-                $dbw->query( $sql, "SearchMySQL4::updateTitle" );
-        }
+               $dbw->query( $sql, "SearchMySQL4::updateTitle" );
+       }
 
 }