modified search

api/search.rb

@@ -63,7 +63,7 @@ get "#{APIPREFIX}/search/threads/recent_active" do
     "today" => Date.today.to_time,
     "this_week" => Date.today.to_time - 1.weeks,
     "this_month" => Date.today.to_time - 1.months,
-  }[params["from_time"] || "today"]
+  }[params["from_time"] || "this_week"]
 
   query_params = {}
   query_params["course_id"] = params["course_id"] if params["course_id"]

app.rb

@@ -33,7 +33,16 @@ APIPREFIX = CommentService::API_PREFIX
 DEFAULT_PAGE = 1
 DEFAULT_PER_PAGE = 20
 
-Dir[File.dirname(__FILE__) + '/api/*.rb'].each {|file| require file}
+# these files must be required in order
+
+require './api/search'
+require './api/commentables'
+require './api/comment_threads'
+require './api/comments'
+require './api/users'
+require './api/votes'
+require './api/tags'
+require './api/notifications_and_subscriptions'
 
 if environment.to_s == "development"
   get "#{APIPREFIX}/clean" do

models/comment_thread.rb

@@ -82,6 +82,7 @@ class CommentThread < Content
   end
 
   def self.perform_search(params, options={})
+    puts "params: #{params}"
     page = [1, options[:page] || 1].max
     per_page = options[:per_page] || 20
     sort_key = options[:sort_key]