Cleaning up the search controller a bit.

app/controllers/search_controller.rb

@@ -19,25 +19,25 @@ def index
       :order => "date ASC"
     )
 
-    @lat_rads = degrees_to_radians(@ip_location[:latitude].to_f)
-    @long_rads = degrees_to_radians(@ip_location[:longitude].to_f)
+    @locations = search_locations(@query)
+    # @groups = Group.search(@query || "")
 
-    @groups = Group.search(@query || "")
-    @locations = Location.search(
-      (@query || ""), 
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml { render :xml => @search }
+    end
+  end
+
+  def search_locations(query)
+    Location.search(
+      (query || ""), 
       :geo => [
         degrees_to_radians(@ip_location[:latitude].to_f),
         degrees_to_radians(@ip_location[:longitude].to_f)
       ],
       :with => { "@geodist" => 0.0..80467.2 }, # 50 miles, in meters
-      :without => { :start_time => 35.years.ago..Time.now }, # A little hard-coded, but it works well enough for now.
       :order => "@geodist ASC"
     )
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml { render :xml => @search }
-    end
   end
 
   private