Partial revert of r32982; old Title method is fine here

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

diff --git a/includes/SearchPostgres.php b/includes/SearchPostgres.php
index 8dd9406..18a02a8 100644 (file)
--- a/includes/SearchPostgres.php
+++ b/includes/SearchPostgres.php
@@ -37,11 +37,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 +171,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";