From 14690e464b1a1b84b46863b26ea6afc3bd7c43ae Mon Sep 17 00:00:00 2001
From: Sean Hammond <seanhammond@lavabit.com>
Date: Mon, 8 Apr 2013 13:36:04 +0200
Subject: [PATCH] [#714] Use score not relevance in default sort order

'relevance' is not actually in the solr schema so it doesn't do
anything, score is the one we want.
---
 ckan/logic/action/get.py             | 2 +-
 ckan/templates/snippets/sort_by.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckan/logic/action/get.py b/ckan/logic/action/get.py
index 17f87cf2446..236e1c3559f 100644
--- a/ckan/logic/action/get.py
+++ b/ckan/logic/action/get.py
@@ -1235,7 +1235,7 @@ def package_search(context, data_dict):
     abort = data_dict.get('abort_search',False)
 
     if data_dict.get('sort') in (None, 'rank'):
-        data_dict['sort'] = 'relevance asc, metadata_modified desc'
+        data_dict['sort'] = 'score desc, metadata_created desc'
 
     results = []
     if not abort:
diff --git a/ckan/templates/snippets/sort_by.html b/ckan/templates/snippets/sort_by.html
index ebbd67461cc..c568e2464f9 100644
--- a/ckan/templates/snippets/sort_by.html
+++ b/ckan/templates/snippets/sort_by.html
@@ -11,7 +11,7 @@
 <span class="form-select control-group control-order-by">
   <label for="field-order-by">{{ _('Order by') }}</label>
   <select id="field-order-by" name="sort">
-    <option value="relevance asc, metadata_modified desc"{% if sort =='relevance asc, metadata_modified desc' %} selected="selected"{% endif %}>{{ _('Relevance') }}</option>
+    <option value="score desc, metadata_modified desc"{% if sort =='score desc, metadata_modified desc' %} selected="selected"{% endif %}>{{ _('Relevance') }}</option>
     <option value="title_string asc"{% if sort=='title_string asc' %} selected="selected"{% endif %}>{{ _('Name Ascending') }}</option>
     <option value="title_string desc"{% if sort=='title_string desc' %} selected="selected"{% endif %}>{{ _('Name Descending') }}</option>
     <option value="metadata_modified desc"{% if sort=='metadata_modified desc' %} selected="selected"{% endif %}>{{ _('Last Modified') }}</option>