Do proper inheritance here instead of copy-paste of top level constructor.

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

diff --git a/includes/SearchPostgres.php b/includes/SearchPostgres.php
index 8dd9406..974e058 100644 (file)
--- a/includes/SearchPostgres.php
+++ b/includes/SearchPostgres.php
@@ -17,9 +17,14 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
+/**
+ * @file
+ * @ingroup Search
+ */
+
 /**
  * Search engine hook base class for Postgres
- * @addtogroup Search
+ * @ingroup Search
  */
 class SearchPostgres extends SearchEngine {
 
@@ -29,7 +34,7 @@ class SearchPostgres extends SearchEngine {
 
        /**
         * Perform a full text search query via tsearch2 and return a result set.
-        * Currently searches a page's current title (page.page_title) and 
+        * Currently searches a page's current title (page.page_title) and
         * latest revision article text (pagecontent.old_text)
         *
         * @param string $term - Raw search term
@@ -37,11 +42,24 @@ class SearchPostgres extends SearchEngine {
         * @access public
         */
        function searchTitle( $term ) {
-               $resultSet = $this->db->resultObject( $this->db->query( $this->searchQuery( $term , 'titlevector', 'page_title' )));
+               $q = $this->searchQuery( $term , 'titlevector', 'page_title' );
+               $olderror = error_reporting(E_ERROR);
+               $resultSet = $this->db->resultObject( $this->db->query( $q, 'SearchPostgres', true ) );
+               error_reporting($olderror);
+               if (!$resultSet) {
+                       // Needed for "Query requires full scan, GIN doesn't support it"
+                       return new SearchResultTooMany();
+               }
                return new PostgresSearchResultSet( $resultSet, $this->searchTerms );
        }
        function searchText( $term ) {
-               $resultSet = $this->db->resultObject( $this->db->query( $this->searchQuery( $term, 'textvector', 'old_text' )));
+               $q = $this->searchQuery( $term, 'textvector', 'old_text' );
+               $olderror = error_reporting(E_ERROR);
+               $resultSet = $this->db->resultObject( $this->db->query( $q, 'SearchPostgres', true ) );
+               error_reporting($olderror);
+               if (!$resultSet) {
+                       return new SearchResultTooMany();
+               }
                return new PostgresSearchResultSet( $resultSet, $this->searchTerms );
        }
 
@@ -158,14 +176,16 @@ class SearchPostgres extends SearchEngine {
 
                ## Redirects
                if (! $this->showRedirects)
-                       $query .= ' AND page_is_redirect = 0::char'; ## IS FALSE
+                       $query .= ' AND page_is_redirect = 0';
 
                ## Namespaces - defaults to 0
-               if ( count($this->namespaces) < 1)
-                       $query .= ' AND page_namespace = 0';
-               else {
-                       $namespaces = implode( ',', $this->namespaces );
-                       $query .= " AND page_namespace IN ($namespaces)";
+               if( !is_null($this->namespaces) ){ // null -> search all
+                       if ( count($this->namespaces) < 1)
+                               $query .= ' AND page_namespace = 0';
+                       else {
+                               $namespaces = implode( ',', $this->namespaces );
+                               $query .= " AND page_namespace IN ($namespaces)";
+                       }
                }
 
                $query .= " ORDER BY score DESC, page_id DESC";
@@ -195,11 +215,11 @@ class SearchPostgres extends SearchEngine {
 } ## end of the SearchPostgres class
 
 /**
- * @addtogroup Search
+ * @ingroup Search
  */
 class PostgresSearchResult extends SearchResult {
        function PostgresSearchResult( $row ) {
-               $this->mTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
+               parent::SearchResult($row);
                $this->score = $row->score;
        }
        function getScore() {
@@ -208,7 +228,7 @@ class PostgresSearchResult extends SearchResult {
 }
 
 /**
- * @addtogroup Search
+ * @ingroup Search
  */
 class PostgresSearchResultSet extends SearchResultSet {
        function PostgresSearchResultSet( $resultSet, $terms ) {
@@ -233,6 +253,3 @@ class PostgresSearchResultSet extends SearchResultSet {
                }
        }
 }
-
-
-