Merge "Make Special:TrackingCategories sortable"

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

diff --git a/includes/search/SearchPostgres.php b/includes/search/SearchPostgres.php
index 8ba49b6..729e528 100644 (file)
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -37,7 +37,7 @@ class SearchPostgres extends SearchDatabase {
         * @param string $term Raw search term
         * @return SqlSearchResultSet
         */
-       function searchTitle( $term ) {
+       protected function doSearchTitle( $term ) {
                $q = $this->searchQuery( $term, 'titlevector', 'page_title' );
                $olderror = error_reporting( E_ERROR );
                $resultSet = $this->db->query( $q, 'SearchPostgres', true );
@@ -45,7 +45,7 @@ class SearchPostgres extends SearchDatabase {
                return new SqlSearchResultSet( $resultSet, $this->searchTerms );
        }
 
-       function searchText( $term ) {
+       protected function doSearchText( $term ) {
                $q = $this->searchQuery( $term, 'textvector', 'old_text' );
                $olderror = error_reporting( E_ERROR );
                $resultSet = $this->db->query( $q, 'SearchPostgres', true );
@@ -61,8 +61,7 @@ class SearchPostgres extends SearchDatabase {
         *
         * @return string
         */
-       function parseQuery( $term ) {
-
+       private function parseQuery( $term ) {
                wfDebug( "parseQuery received: $term \n" );
 
                # # No backslashes allowed
@@ -115,7 +114,6 @@ class SearchPostgres extends SearchDatabase {
                wfDebug( "parseQuery returned: $searchstring \n" );
 
                return $searchstring;
-
        }
 
        /**
@@ -125,7 +123,7 @@ class SearchPostgres extends SearchDatabase {
         * @param string $colname
         * @return string
         */
-       function searchQuery( $term, $fulltext, $colname ) {
+       private function searchQuery( $term, $fulltext, $colname ) {
                # Get the SQL fragment for the given term
                $searchstring = $this->parseQuery( $term );