From 9020a9a20130ac2712f2a7406ee34ed9c39064d1 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Mon, 10 Nov 2008 05:19:50 +0000
Subject: #331719 follow-up by chx: Remove ambiguity from search score queries.

---
 modules/search/search.module | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/search/search.module')

diff --git a/modules/search/search.module b/modules/search/search.module
index 627983476..08af04d03 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -903,8 +903,8 @@ function _search_parse_query(&$word, &$scores, $not = FALSE) {
  *
  * @param $columns2
  *   (optional) Inserted into the SELECT pat of the second query. Must contain
- *   a column selected as 'score'.
- *   defaults to 'i.relevance AS score'
+ *   a column selected as 'calculated_score'.
+ *   defaults to 'i.relevance AS calculated_score'
  *
  * @param $join2
  *   (optional) Inserted into the JOIN par of the second SQL query.
@@ -915,14 +915,14 @@ function _search_parse_query(&$word, &$scores, $not = FALSE) {
  *
  * @param $sort_parameters
  *   (optional) SQL arguments for sorting the final results.
- *              Default: 'ORDER BY score DESC'
+ *              Default: 'ORDER BY calculated_score DESC'
  *
  * @return
  *   An array of SIDs for the search results.
  *
  * @ingroup search
  */
-function do_search($keywords, $type, $join1 = '', $where1 = '1 = 1', $arguments1 = array(), $columns2 = 'i.relevance AS score', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY score DESC') {
+function do_search($keywords, $type, $join1 = '', $where1 = '1 = 1', $arguments1 = array(), $columns2 = 'i.relevance AS calculated_score', $join2 = '', $arguments2 = array(), $sort_parameters = 'ORDER BY calculated_score DESC') {
   $query = search_parse_query($keywords);
 
   if ($query[2] == '') {
-- 
cgit v1.2.3