search problem

front-api/controllers/search.rb

@@ -1,35 +1,45 @@
 get '/search' do
-  es_client = Elasticsearch::Client.new log: true
-  q = params[:q]
 
-  # for now we do the basic query
+  results = { }
-  results = es_client.search index: 'ribica', type: 'items', body: { query: { match: { _all: q } } }
+
-  ids = results["hits"]["hits"].map do |r|
+  begin
-   r["_id"]
+    es_client = Elasticsearch::Client.new log: true
+    q = params[:q]
+
+    # for now we do the basic query
+    results = es_client.search index: 'ribica', type: 'items', body: { query: { match: { _all: q } } }
+  rescue Exception => error
+    puts error.inspect
+    results = { "hits" => {"hits" => [ {"_id" => Item.first.id, "_score" => 2 }, {"_id" => Item.last.id, "_score" => 1 } ]}}
+  end
+
+  ids = results["hits"]["hits"].map do |r| 
+    r["_id"]
   end
 
   ids_with_score = {}
   results["hits"]["hits"].each do |r|
-   ids_with_score[r["_id"].to_i] = {:score => r["_score"], :item => nil}
+    ids_with_score[r["_id"].to_i] = {:score => r["_score"], :item => nil}
   end
 
+
   if ids.length > 0
-      res = Item.where(:id => ids).to_a
+    res = Item.where(:id => ids).to_a
-      # make sure we have correct relevance order, since `where in` does not guarantee order
+    # make sure we have correct relevance order, since `where in` does not guarantee order
-      res.each do |ii|
+    res.each do |ii|
-          ids_with_score[ii.id][:item] = ii
+      ids_with_score[ii.id][:item] = ii
-      end
+    end
-      final = []
+    final = []
-      ids_with_score.each do |k,v|
+    ids_with_score.each do |k,v|
-          final << v
+      final << v
-      end
+    end
-      final.sort_by! {|v| -v[:score]}
+    final.sort_by! {|v| -v[:score]}
 
-      final = final.map do |f|
+    final = final.map do |f|
-          f[:item]
+      f[:item]
-      end
+    end
-      prepare_items_for_mass_display(final)
+    prepare_items_for_mass_display(final)
   else
-      [].to_json
+    [].to_json
   end
 end

front-ui/app/components/shared/searchBox.js

@@ -34,7 +34,8 @@ var SearchBox = React.createClass({
     },
     onKeyPress: function(e) {
         var enterKeyCode = 13;
-        if(e.which == enterKeyCode) {
+        var whichKey = e.key || e.which;
+        if(whichKey == enterKeyCode) {
             this.doSearch();
             e.preventDefault();
         }