From 7401359144dd18d6af934e9e1d06614d1fa8e4a4 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Mon, 28 Jul 2014 16:21:08 +0900
Subject: [PATCH] Search using network

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

diff --git a/client/application.js b/client/application.js
index b8f0b5e..a4263bc 100644
--- a/client/application.js
+++ b/client/application.js
@@ -11,20 +11,29 @@ function outputResults(results, maxResults) {
 }
 
 function onAdjust(name, value) {
-    // var wa = window.adjuster;
-    // var wg = window.grapher;
+    var wa = window.adjuster;
+    var wg = window.grapher;
 
-    // wa.searchParams[name] = value;
-    // console.log(wa.searchParams);
+    wa.searchParams[name] = value;
+    console.log(wa.searchParams);
 
-    // var hintData = {};
-    // _.each(wg.getColumnNames(), function(name) {
-    //     hintData[name] = searchBuildHints(wa.searchParams, wa.minScore, name, wa.searchRange, wa.hintSteps);
-    // });
-    // wg.setColumnHints(hintData);
+    var params = {
+        searchParams: wa.searchParams,
+        searchRange:  wa.searchRange,
+        minScore:     wa.minScore,
+        hintSteps:    wa.hintSteps,
+        maxResults:   wa.maxResults
+    };
 
-    // var results = searchData(wa.searchParams, wa.minScore);
-    // outputResults(results, wa.maxResults);
+    $.getJSON('/node/search', params, function(results) {
+        var hintData = { };
+        for (var feature in results.columns) {
+            hintData[feature] = results.columns[feature].hints;
+        }
+
+        wg.setColumnHints(hintData);
+        outputResults(results.items, params.maxResults);
+    });
 }
 
 function onSearch() {
diff --git a/server/db/search.js b/server/db/search.js
index 8640208..bcc64a6 100644
--- a/server/db/search.js
+++ b/server/db/search.js
@@ -130,7 +130,7 @@ module.exports.getKeywords = function() {
 }
 
 module.exports.execQuery = function(query) {
-    var searchParams  = db_keywords[query.keyword];
+    var searchParams  = query.searchParams || db_keywords[query.keyword];
     var searchResults = searchData(searchParams, query.minScore);
     var graphColumns  = { };