From a9f03b30f63697aa537fd99324ea16c4ddacafa4 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 28 Jul 2014 15:51:48 +0900
Subject: [PATCH] Output search results

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

diff --git a/client/application.js b/client/application.js
index ddc7fea..b8f0b5e 100644
--- a/client/application.js
+++ b/client/application.js
@@ -29,19 +29,19 @@ function onAdjust(name, value) {
 
 function onSearch() {
     var params = {
-        'keyword':          $('#keyword').val(),
-        'minScore':         parseInt($('#minScore').val()),
-        'hintSteps':        parseInt($('#hintSteps').val()),
-        'maxResults':       parseInt($('#maxResults').val()),
-        'useLocalScale':    true,
-        'useRelativeScale': true
+        keyword:          $('#keyword').val(),
+        searchRange:      { min: -1.0, max: 1.0 },
+        minScore:         parseInt($('#minScore').val()),
+        hintSteps:        parseInt($('#hintSteps').val()),
+        maxResults:       parseInt($('#maxResults').val()),
+        useLocalScale:    true,
+        useRelativeScale: true
     };
 
     $.getJSON('/node/search', params, function(results) {
-        console.log(results);
-
         window.adjuster = {
             searchParams: results.params,
+            searchRange:  params.searchRange,
             minScore:     params.minScore,
             hintSteps:    params.hintSteps,
             maxResults:   params.maxResults
@@ -51,8 +51,7 @@ function onSearch() {
         window.grapher.setColumns(results.columns);
         window.grapher.setValueChangedListener(onAdjust);
 
-        // var results = searchData(searchParams, minScore);
-        // outputResults(results, maxResults);
+        outputResults(results.items, params.maxResults);
 
         $('#query').text(params.keyword);
         $('#useLocalScale').prop('checked', useLocalScale);
diff --git a/server/db/search.js b/server/db/search.js
index 1c31730..8640208 100644
--- a/server/db/search.js
+++ b/server/db/search.js
@@ -56,8 +56,8 @@ function searchProjection(searchParams, minScore, feature, range, steps) {
     searchStepper(range, steps, function(position) {
         testParams[feature] = position;
         results.push({
-            'sample': position,
-            'values': searchData(testParams, minScore)
+            sample: position,
+            values: searchData(testParams, minScore)
         });
     });
 
@@ -73,9 +73,9 @@ function searchProjection2d(searchParams, minScore, feature1, feature2, range, s
         searchStepper(range, steps, function(sampleY) {
             testParams[feature2] = sampleY;
             results.push({
-                'sampleX': sampleX,
-                'sampleY': sampleY,
-                'values':  searchData(testParams, minScore)
+                sampleX: sampleX,
+                sampleY: sampleY,
+                values:  searchData(testParams, minScore)
             });
         });
     });
@@ -95,8 +95,8 @@ function searchBuildHints(searchParams, minScore, feature, range, steps) {
     var hints = [];
     _.each(projection, function(result) {
         hints.push({
-            'sample': result.sample,
-            'count':  result.values.length
+            sample: result.sample,
+            count:  result.values.length
         });
     });
 
@@ -116,9 +116,9 @@ function searchBuildHints2d(searchParams, minScore, feature1, feature2, range, s
     var hints = [];
     _.each(projection, function(result) {
         hints.push({
-            'sampleX': result.sampleX,
-            'sampleY': result.sampleY,
-            'count':   result.values.length
+            sampleX: result.sampleX,
+            sampleY: result.sampleY,
+            count:   result.values.length
         });
     });
 
@@ -130,29 +130,30 @@ module.exports.getKeywords = function() {
 }
 
 module.exports.execQuery = function(query) {
-    var searchParams = db_keywords[query.keyword];
-    var searchRange  = { 'min': -1.0, 'max': 1.0 };
-    var graphColumns = { };
+    var searchParams  = db_keywords[query.keyword];
+    var searchResults = searchData(searchParams, query.minScore);
+    var graphColumns  = { };
 
     for (var feature in searchParams) {
-        var hints = searchBuildHints(
+        var searchHints = searchBuildHints(
             searchParams,
             query.minScore,
             feature,
-            searchRange,
+            query.searchRange,
             query.hintSteps
         );
 
         graphColumns[feature] = {
-            'color': '#607080',
-            'value': searchParams[feature],
-            'hints': hints,
-            'steps': query.hintSteps
+            color: '#607080',
+            value: searchParams[feature],
+            hints: searchHints,
+            steps: query.hintSteps
         }
     }
 
     return {
-        'columns': graphColumns,
-        'params':  searchParams
+        columns: graphColumns,
+        params:  searchParams,
+        items:   searchResults
     };
 }