From 523f8bc5a52514f30d4b7c306e1813ecf628483a Mon Sep 17 00:00:00 2001
From: kelson42 <kelson42@users.sourceforge.net>
Date: Tue, 14 Aug 2012 16:36:18 +0000
Subject: [PATCH] + remove js warning in kiwix-serve autosuggest

---
 src/server/kiwix-serve.cpp      | 7 ++++---
 static/server/taskbar.html.part | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/server/kiwix-serve.cpp b/src/server/kiwix-serve.cpp
index 956fe3f..73e78ec 100644
--- a/src/server/kiwix-serve.cpp
+++ b/src/server/kiwix-serve.cpp
@@ -212,7 +212,7 @@ static int accessHandlerCallback(void *cls,
     }
 
     if (isVerbose()) {
-      std::cout << "Searching suggestions for: \"" << term<< "\"" << endl;
+      std::cout << "Searching suggestions for: \"" << term << "\"" << endl;
     }
 
     reader->searchSuggestions(term, 10);
@@ -220,9 +220,10 @@ static int accessHandlerCallback(void *cls,
     content = "[";
     while (reader->getNextSuggestion(suggestion)) {
       content += content == "[" ? "" : ",";
-      content += "{\"value\":\"" + suggestion + "\",\"id\":\"" + suggestion + "\"}";
+      content += "{\"value\":\"" + suggestion + "\",\"label\":\"" + suggestion + "\"}";
     }
-    content += "]\n";
+    content += "]";
+    mimeType = "text/x-json; charset=utf-8";
   }
 
   /* Get static skin stuff */
diff --git a/static/server/taskbar.html.part b/static/server/taskbar.html.part
index 0ea2f35..327bf88 100644
--- a/static/server/taskbar.html.part
+++ b/static/server/taskbar.html.part
@@ -3,6 +3,8 @@
   $( "#kiwixsearchbox" ).autocomplete({
 
   source: "/suggest?content=__CONTENT__",
+  dataType: "json",
+  cache: false,
 
   select: function(event, ui) {
   $( "#kiwixsearchform" ).submit();