From a7fc6c17628fc19a21d1e246abacd03c16413738 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 15 Sep 2014 17:31:41 +0900
Subject: [PATCH] Rebasing minScore depending on number of keywords, fixing
 bugs

---
 client/application.js | 5 ++++-
 client/index.html     | 2 +-
 server/db/search.js   | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/client/application.js b/client/application.js
index 729e61f..cb8680a 100644
--- a/client/application.js
+++ b/client/application.js
@@ -48,7 +48,10 @@
 
             outputResults(results.items, params.maxResults);
 
-            $('#query').text(params.keywords.join(', '));
+            if (params.keywords) {
+                $('#query').text(params.keywords.join(', '));
+            }
+
             $('#useLocalScale').click(function() {
                 var useLocalScale = $('#useLocalScale').is(':checked');
                 ctx.grapher.setUseLocalScale(useLocalScale);
diff --git a/client/index.html b/client/index.html
index 97a7cbc..2dbabf0 100644
--- a/client/index.html
+++ b/client/index.html
@@ -27,7 +27,7 @@
                     <div class="form-group">
                         <label for="minScore" class="col-md-2 control-label">Minimum score</label>
                         <div class="col-md-10">
-                            <input class="form-control" type="number" step="any" value="1.0" id="minScore" name="minScore">
+                            <input class="form-control" type="number" step="any" value="0.25" id="minScore" name="minScore">
                         </div>
                     </div>
                     <div class="form-group">
diff --git a/server/db/search.js b/server/db/search.js
index 255e96f..40a95f2 100644
--- a/server/db/search.js
+++ b/server/db/search.js
@@ -138,7 +138,7 @@ module.exports.execQuery = function(query) {
 
     var searchResults = findData(
         query.searchParams,
-        query.minScore,
+        query.minScore * _.keys(query.searchParams).length,
         query.maxResults
     );
 
@@ -146,7 +146,7 @@ module.exports.execQuery = function(query) {
     for (var keyword in query.searchParams) {
         var searchHints = searchBuildHints(
             query.searchParams,
-            query.minScore,
+            query.minScore * _.keys(query.searchParams).length,
             keyword,
             query.searchRange,
             query.hintSteps