Remove adittional type hinting stuff because PHP will die if its there >_>

[lhc/web/wiklou.git] / includes / search / SearchOracle.php

diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 2c820e0..1c45dc4 100644 (file)
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -1,23 +1,25 @@
 <?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
-# (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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
 /**
+ * Oracle search engine
+ *
+ * Copyright © 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
+ * (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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup Search
  */
@@ -54,9 +56,13 @@ class SearchOracle extends SearchEngine {
                                                                        'TRSYN' => 1, 
                                                                        'TT' => 1, 
                                                                        'WITHIN' => 1);
-       
+
+       /**
+        * Creates an instance of this class
+        * @param $db DatabasePostgres: database object
+        */
        function __construct($db) {
-               $this->db = $db;
+               parent::__construct( $db );
        }
 
        /**
@@ -117,18 +123,22 @@ class SearchOracle extends SearchEngine {
 
        /**
         * Return a LIMIT clause to limit results on the query.
+        *
+        * @param string
+        *
         * @return String
         */
-       function queryLimit($sql) {
+       function queryLimit( $sql ) {
                return $this->db->limitResult($sql, $this->limit, $this->offset);
        }
 
        /**
         * Does not do anything for generic search engine
         * subclasses may define this though
+        *
         * @return String
         */
-       function queryRanking($filteredTerm, $fulltext) {
+       function queryRanking( $filteredTerm, $fulltext ) {
                return ' ORDER BY score(1)';
        }
 
@@ -137,6 +147,7 @@ class SearchOracle extends SearchEngine {
         * The guts shoulds be constructed in queryMain()
         * @param $filteredTerm String
         * @param $fulltext Boolean
+        * @return String
         */
        function getQuery( $filteredTerm, $fulltext ) {
                return $this->queryLimit($this->queryMain($filteredTerm, $fulltext) . ' ' .
@@ -174,13 +185,14 @@ class SearchOracle extends SearchEngine {
        /**
         * Parse a user input search string, and return an SQL fragment to be used
         * as part of a WHERE clause
+        * @return string
         */
        function parseQuery($filteredText, $fulltext) {
                global $wgContLang;
                $lc = SearchEngine::legalSearchChars();
                $this->searchTerms = array();
 
-               # FIXME: This doesn't handle parenthetical expressions.
+               # @todo FIXME: This doesn't handle parenthetical expressions.
                $m = array();
                $searchon = '';
                if (preg_match_all('/([-+<>~]?)(([' . $lc . ']+)(\*?)|"[^"]*")/',
@@ -240,8 +252,16 @@ class SearchOracle extends SearchEngine {
                                'si_title' => $title,
                                'si_text' => $text
                        ), 'SearchOracle::update' );
-               $dbw->query("CALL ctx_ddl.sync_index('si_text_idx')");
-               $dbw->query("CALL ctx_ddl.sync_index('si_title_idx')");
+
+               // Sync the index
+               // We need to specify the DB name (i.e. user/schema) here so that 
+               // it can work from the installer, where
+               //     ALTER SESSION SET CURRENT_SCHEMA = ...
+               // was used.
+               $dbw->query( "CALL ctx_ddl.sync_index(" . 
+                       $dbw->addQuotes( $dbw->getDBname() . '.' . $dbw->tableName( 'si_text_idx', 'raw' ) ) . ")" );
+               $dbw->query( "CALL ctx_ddl.sync_index(" . 
+                       $dbw->addQuotes( $dbw->getDBname() . '.' . $dbw->tableName( 'si_title_idx', 'raw' ) ) . ")" );
        }
 
        /**