* Add exception hooks to output pretty messages

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

diff --git a/includes/SearchTsearch2.php b/includes/SearchTsearch2.php
index 2cff2cb..06eaa72 100644 (file)
--- a/includes/SearchTsearch2.php
+++ b/includes/SearchTsearch2.php
@@ -14,29 +14,23 @@
 #
 # 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
 
 /**
  * Search engine hook for PostgreSQL / Tsearch2
- * @package MediaWiki
- * @subpackage Search
+ * @addtogroup Search
  */
 
-/** */
-require_once( 'SearchEngine.php' );
-
 /**
  * @todo document
- * @package MediaWiki
- * @subpackage Search
+ * @addtogroup Search
  */
 class SearchTsearch2 extends SearchEngine {
        var $strictMatching = false;
 
        function SearchTsearch2( &$db ) {
                $this->db =& $db;
-               $this->db->setSchema('tsearch');
                $this->mRanking = true;
        }
 
@@ -51,6 +45,7 @@ class SearchTsearch2 extends SearchEngine {
                $this->searchTerms = array();
 
                # FIXME: This doesn't handle parenthetical expressions.
+               $m = array();
                if( preg_match_all( '/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
                          $filteredText, $m, PREG_SET_ORDER ) ) {
                        foreach( $m as $terms ) {
@@ -68,7 +63,7 @@ class SearchTsearch2 extends SearchEngine {
                                $this->searchTerms[] = $regexp;
                        }
                        wfDebug( "Would search with '$searchon'\n" );
-                       wfDebug( "Match with /\b" . implode( '\b|\b', $this->searchTerms ) . "\b/\n" );
+                       wfDebug( 'Match with /\b' . implode( '\b|\b', $this->searchTerms ) . "\b/\n" );
                } else {
                        wfDebug( "Can't understand search query '{$this->filteredText}'\n" );
                }
@@ -99,8 +94,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,18 +105,18 @@ 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('" .
+                               $dbw->strencode( $title ) .
+                               "') WHERE si_page={$id}";
 
-                $dbw->query( $sql, "SearchMySQL4::updateTitle" );
-        }
+               $dbw->query( $sql, "SearchMySQL4::updateTitle" );
+       }
 
 }
 
-?>
+