From 2229babf68226fe8145afcaf1864f6fa7fada440 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Sat, 11 Jan 2014 06:27:05 -0600
Subject: [PATCH] vrfs-988:  refactoring search as text by entity, rather than
 site-wide

---
 web/app/assets/javascripts/sidebar.js        |  2 +-
 web/app/controllers/api_search_controller.rb | 15 +++++++--------
 web/app/views/clients/_sidebar.html.erb      | 10 ++--------
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/web/app/assets/javascripts/sidebar.js b/web/app/assets/javascripts/sidebar.js
index 618e88d39..fe7976ecb 100644
--- a/web/app/assets/javascripts/sidebar.js
+++ b/web/app/assets/javascripts/sidebar.js
@@ -432,8 +432,8 @@
                     if (query === '') {
                         return hideSearchResults();
                     }
-
                     if (query.length > 2) {
+			query += '&srch_t='+$('#search_text_type').val();
                         emptySearchResults();
                         search(query);
                     }
diff --git a/web/app/controllers/api_search_controller.rb b/web/app/controllers/api_search_controller.rb
index 63c0ff8d9..ca68d8c1a 100644
--- a/web/app/controllers/api_search_controller.rb
+++ b/web/app/controllers/api_search_controller.rb
@@ -6,18 +6,17 @@ class ApiSearchController < ApiController
   respond_to :json
 
   def index
-    if 1 == params[Search::PARAM_MUSICIAN].to_i
+    if 1 == params[Search::PARAM_MUSICIAN].to_i || 1 == params[Search::PARAM_BAND].to_i
       query = params.clone
       query[:remote_ip] = request.remote_ip
-      @search = Search.musician_search(query, current_user)
-      respond_with @search, responder: ApiResponder, :status => 200
-    elsif 1 == params[Search::PARAM_BAND].to_i
-      query = params.clone
-      query[:remote_ip] = request.remote_ip
-      @search = Search.band_search(query, current_user)
+      if 1 == params[Search::PARAM_MUSICIAN].to_i
+        @search = Search.musician_filter(query, current_user)
+      else
+        @search = Search.band_filter(query, current_user)
+      end
       respond_with @search, responder: ApiResponder, :status => 200
     else
-      @search = Search.search(params[:query], current_user.id)
+      @search = Search.text_search(params, current_user)
     end
   end
 end
diff --git a/web/app/views/clients/_sidebar.html.erb b/web/app/views/clients/_sidebar.html.erb
index 4ac3fb7f7..4b9732765 100644
--- a/web/app/views/clients/_sidebar.html.erb
+++ b/web/app/views/clients/_sidebar.html.erb
@@ -25,13 +25,7 @@
                 </div>
                 <!-- search filter dropdown -->
                 <div class="right">
-                    Show:
-                    <select>
-                        <option>Musicians</option>
-                        <option>Bands</option>
-                        <option>Fans</option>
-                        <option>Recordings</option>
-                    </select>
+                    Show:&nbsp;<%= select_tag(Search::SEARCH_TEXT_TYPE_ID, options_for_select(Search::SEARCH_TEXT_TYPES.collect { |ii| [ii.to_s.titleize, ii] })) %>
                 </div>
             </div>
         </div>
@@ -200,4 +194,4 @@
         </div>
         <br clear="all" />
     </li>
-</script>
\ No newline at end of file
+</script>