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/node/node.module | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/modules/node/node.module b/modules/node/node.module
index 7c8763cd3..8c8ecd48a 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -1333,13 +1333,13 @@ function node_search($op = 'search', $keys = NULL) {
         $total = 1;
         $arguments2 = array();
         $join2 = '';
-        $select2 = 'i.relevance AS score';
+        $select2 = 'i.relevance AS calculated_score';
       }
       else {
         $total = $rankings['total'];
         $arguments2 = $rankings['arguments'];
         $join2 = implode(' ', $rankings['join']);
-        $select2 = '('. implode(' + ', $rankings['score']) .') AS score';
+        $select2 = '('. implode(' + ', $rankings['score']) .') AS calculated_score';
       }
 
       // Do search.
@@ -1369,7 +1369,7 @@ function node_search($op = 'search', $keys = NULL) {
           'date' => $node->changed,
           'node' => $node,
           'extra' => $extra,
-          'score' => $total ? ($item->score / $total) : 0,
+          'score' => $total ? ($item->calculated_score / $total) : 0,
           'snippet' => search_excerpt($keys, $node->body),
         );
       }
-- 
cgit v1.2.3