From 5c9ddb7c0dc239c4a4a6be66e02945a436e1c57c Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 18 Sep 2014 16:24:40 +0900
Subject: [PATCH] Removing unnecessary returned data from server

---
 client/application.js | 43 +++++++++++++++++++++++--------------------
 server/search.js      | 11 -----------
 2 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/client/application.js b/client/application.js
index 8b40bc8..33fa457 100644
--- a/client/application.js
+++ b/client/application.js
@@ -7,7 +7,7 @@
     function onAdjust(name, value) {
         ctx.searchParams[name] = value;
 
-        var params = {
+        var query = {
             searchParams: ctx.searchParams,
             searchRange:  ctx.searchRange,
             minScore:     ctx.minScore,
@@ -15,7 +15,7 @@
             maxResults:   ctx.maxResults
         };
 
-        $.getJSON('/node/search', params, function(results) {
+        $.getJSON('/node/search', query, function(results) {
             var hintData = {};
             for (var keyword in results.columns) {
                 hintData[keyword] = results.columns[keyword].hints;
@@ -27,20 +27,27 @@
     }
 
     function onSearch() {
-        var params = {
-            keywords:    $('#keywords').val(),
-            searchRange: { min: -1.0, max: 1.0 },
-            minScore:    parseFloat($('#minScore').val()),
-            hintSteps:   parseInt($('#hintSteps').val()),
-            maxResults:  parseInt($('#maxResults').val())
+        var keywords     = $('#keywords').val() || [];
+        var searchParams = {};
+
+        for (var i = 0, count = keywords.length; i < count; ++i) {
+            searchParams[keywords[i]] = 1.0;
+        }
+
+        var query = {
+            searchParams: searchParams,
+            searchRange:  { min: -1.0, max: 1.0 },
+            minScore:     parseFloat($('#minScore').val()),
+            hintSteps:    parseInt($('#hintSteps').val()),
+            maxResults:   parseInt($('#maxResults').val())
         };
 
-        $.getJSON('/node/search', params, function(results) {
-            ctx.searchParams = results.params;
-            ctx.searchRange  = params.searchRange;
-            ctx.minScore     = params.minScore;
-            ctx.hintSteps    = params.hintSteps;
-            ctx.maxResults   = params.maxResults;
+        $.getJSON('/node/search', query, function(results) {
+            ctx.searchParams = query.searchParams;
+            ctx.searchRange  = query.searchRange;
+            ctx.minScore     = query.minScore;
+            ctx.hintSteps    = query.hintSteps;
+            ctx.maxResults   = query.maxResults;
 
             ctx.grapher = new Grapher('grapher', ctx.searchRange, 150, true, true);
             ctx.grapher.setColumns(results.columns);
@@ -48,10 +55,7 @@
 
             outputResults(results.items, results.count);
 
-            if (params.keywords) {
-                $('#query').text(params.keywords.join(', '));
-            }
-
+            $('#query').text(keywords.join(', '));
             $('#useLocalScale').click(function() {
                 var useLocalScale = $('#useLocalScale').is(':checked');
                 ctx.grapher.setUseLocalScale(useLocalScale);
@@ -99,12 +103,11 @@
                     }));
                 }
 
+                $('#search').click(onSearch);
                 $('#keywords').selectpicker('refresh');
                 $('#keywords').change(function() {
                     $('#search').prop('disabled', $(this).val() === null);
                 });
-
-                $('#search').click(onSearch);
             });
         }
     });
diff --git a/server/search.js b/server/search.js
index f09f83a..63091f1 100644
--- a/server/search.js
+++ b/server/search.js
@@ -182,16 +182,6 @@ function getData(callback) {
 
 function execQuery(query, callback) {
     getData(function(data) {
-        if (!query.searchParams) {
-            query.searchParams = {};
-            for (var i = 0, count = query.keywords.length; i < count; ++i) {
-                var keyword = query.keywords[i];
-                if (_.has(data.keywords, keyword)) {
-                    query.searchParams[keyword] = 1.0;
-                }
-            }
-        }
-
         var searchResults = findRecords(
             data,
             query.searchParams,
@@ -219,7 +209,6 @@ function execQuery(query, callback) {
 
         callback({
             columns: graphColumns,
-            params:  query.searchParams,
             items:   searchResults.slice(0, query.maxResults),
             count:   searchResults.length
         });