From 0684fe9a69ba647c8bc0f9893e0f6cc874b94536 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Fri, 19 Sep 2014 15:08:09 +0900
Subject: [PATCH] Interface improvements

---
 client/application.js | 29 ++++++++++++++++++-----------
 client/index.html     |  2 +-
 server/search.js      | 15 ++++-----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/client/application.js b/client/application.js
index d0c461a..f7e0435 100644
--- a/client/application.js
+++ b/client/application.js
@@ -71,18 +71,24 @@
     }
 
     function onLearn() {
-        var query = {
-            keyword: $('#keyword').val(),
-            params:  ctx.searchParams
-        };
+        $('#learn').prop('disabled', true);
 
-        $.getJSON('/node/addKeyword', query, function(results) {
-            if (results.success) {
-                $('#learnDlg').modal('hide');
-            }
-            else {
-                $('#learnError').fadeIn();
-            }
+        $('#learnError').slideUp(function() {
+            var query = {
+                keyword: $('#keyword').val(),
+                params:  ctx.searchParams
+            };
+
+            $.getJSON('/node/addKeyword', query, function(results) {
+                if (results.success) {
+                    $('#learnDlg').modal('hide');
+                }
+                else {
+                    $('#learnError').slideDown(function() {
+                        $('#learn').prop('disabled', false);
+                    });
+                }
+            });
         });
     }
 
@@ -124,6 +130,7 @@
                 $('#learnDlg').on('show.bs.modal', function() {
                     $('#learn').prop('disabled', true);
                     $('#keyword').val('');
+                    $('#learnError').hide();
                 });
 
                 $('#learn').click(onLearn);
diff --git a/client/index.html b/client/index.html
index bc11b73..9d7a461 100644
--- a/client/index.html
+++ b/client/index.html
@@ -87,7 +87,7 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="alert alert-danger" id="learnError" style="display: none;">Error learning keyword</div>
+                            <div class="alert alert-danger" id="learnError" style="display: none;">Error writing keyword to database</div>
                         </div>
                         <div class="modal-footer">
                             <div class="btn-group">
diff --git a/server/search.js b/server/search.js
index c3d315a..51858df 100644
--- a/server/search.js
+++ b/server/search.js
@@ -146,19 +146,12 @@ function loadDb(params) {
 }
 
 function addKeyword(query, callback) {
-    if (!query.keyword) {
-        callback({
-            keyword: query.keyword,
-            success: false
-        });
-
-        return;
-    }
-
     getKeywords(function(keywords) {
+        var keyword  = query.keyword.toLowerCase();
         var features = combine(keywords, query.params);
+
         var values = [
-            query.keyword,
+            keyword,
             features.food || 0.0,
             features.service || 0.0,
             features.value || 0.0,
@@ -167,7 +160,7 @@ function addKeyword(query, callback) {
 
         connection.query('INSERT INTO keywords VALUES(?, ?, ?, ?, ?)', values, function(err) {
             callback({
-                keyword: query.keyword,
+                keyword: keyword,
                 success: err === null
             });
         });