Cleanup, start on the advanced search stuff.

app/controllers/advanced_search_controller.rb

@@ -0,0 +1,10 @@
+class AdvancedSearchController < ApplicationController
+  before_filter :is_admin
+
+  def contacts
+  end
+
+  def notes
+  end
+
+end

app/controllers/contacts_controller.rb

@@ -16,7 +16,7 @@ def manage_tags
         (new_tags and new_tags.collect{|t|t.to_i}),
         (current_tags and current_tags.collect{|t|t.to_i})
       ].flatten.uniq.compact
-      logger.warn('Deduped Tags: ' + deduped_tags.inspect)
+      #logger.warn('Deduped Tags: ' + deduped_tags.inspect)
       @object.tag_ids = deduped_tags || []
       @object.save
     end
@@ -62,7 +62,7 @@ def index
       end
     end
 
-    logger.warn("Ferret search string: " + ferret_fields)
+    #logger.warn("Ferret search string: " + ferret_fields)
 
     if params[:export].blank?
       if ferret_fields == '* '
@@ -137,7 +137,7 @@ def update
       flash[:notice] = 'Saved!'
       redirect_to :controller => '/admin/dashboard', :action => :dashboard and return
     else
-      logger.warn('update failed.')
+      #logger.warn('update failed.')
       render :template => 'contacts/edit' and return
     end
   end
@@ -149,7 +149,7 @@ def destroy
       flash[:notice] = 'Gone!'
       redirect_to :controller => '/admin/dashboard', :action => :dashboard and return
     rescue Exception => exc
-      logger.error "Destroy failed #{exc.message}"
+      #logger.error "Destroy failed #{exc.message}"
       flash[:error] = 'There was an error deleting that item. Sorry!'
     end
   end

app/controllers/saved_searches_controller.rb

@@ -32,7 +32,7 @@ def create
   def show
     @saved_search = SavedSearch.find(params[:id])
   rescue Exception => exc
-    flash[:error] = "There was an error when we looked for that tag: #{exc.message}"
+    flash[:error] = "There was an error when we looked for that saved search: #{exc.message}"
     redirect_to :action => :index and return
   end
 

app/helpers/advanced_search_helper.rb

@@ -0,0 +1,2 @@
+module AdvancedSearchHelper
+end

app/views/advanced_search/contacts.html.erb

@@ -0,0 +1,23 @@
+<% form_tag contacts_url do %>
+  <%= text_field_tag :q, params[:q] %>
+  <%= submit_tag 'Go' %>
+<% end %>
+
+<table border="0" cellpadding="5" cellspacing="0">
+  <tr>
+    <th>all these words:</th>
+    <td><%= text_field_tag :all_words, params[:all_words], :size => 50 %></td>
+  </tr>
+  <tr>
+    <th>this exact phrase:</th>
+    <td><%= text_field_tag :exact_phrase, params[:exact_phrase], :size => 50 %></td>
+  </tr>
+  <tr>
+    <th>one or more of these words:</th>
+    <td>
+      <%= text_field_tag 'ors[]', (params[:ors] ? params[:ors][0] : ''), :size => 15 %>
+      <%= text_field_tag 'ors[]', (params[:ors] ? params[:ors][1] : ''), :size => 15 %>
+      <%= text_field_tag 'ors[]', (params[:ors] ? params[:ors][2] : ''), :size => 15 %>
+    </td>
+  </tr>
+</table>

app/views/advanced_search/notes.html.erb

@@ -0,0 +1,2 @@
+<h1>AdvancedSearch#notes</h1>
+<p>Find me in app/views/advanced_search/notes.html.erb</p>

test/functional/admin/saved_search_controller_test.rb → test/functional/advanced_search_controller_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class Admin::SavedSearchControllerTest < ActionController::TestCase
+class AdvancedSearchControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   test "the truth" do
     assert true

test/unit/helpers/advanced_search_helper_test.rb

@@ -0,0 +1,4 @@
+require 'test_helper'
+
+class AdvancedSearchHelperTest < ActionView::TestCase
+end