diff --git a/app/controllers/personal_books_controller.rb b/app/controllers/personal_books_controller.rb
index 8b587be..8b83b5c 100644
--- a/app/controllers/personal_books_controller.rb
+++ b/app/controllers/personal_books_controller.rb
@@ -20,7 +20,37 @@ class PersonalBooksController < ApplicationController
         "book_title"
       ]
     end
-
+    if params[:selectbox] !=nil
+      books = Book.where(:is_hidden=>false)
+      books_count = books.count
+      books_temp = books.take(books_count).sort_by{ |tp| [-tp[:year].to_i,-tp[:publication_date].to_i] }
+      case params[:selectbox]
+      when "book_title", "extracted_chapters", "default"
+        if  page.custom_string_field == "table"
+         books_show = books_temp.select {|value| value.send(params[:selectbox]).include? params[:keywords]}
+        else
+         books_show = books_temp.select {|value| value.create_link.include? params[:keywords]}
+        end
+      when "publish_date", "publication_date"
+          books_show = books_temp.select {|value| value.publication_date.strftime("%Y/%m").include? params[:keywords]}
+      when "author_type"
+          books_show = books_temp.select {|value| value.book_author_types.collect{|bat| bat.title}.join(", ").include? params[:keywords]}
+      when "language"
+          books_show = books_temp.select {|value| (!value.language.nil? ? I18n.t("personal_book.#{value.language}") : "").include? params[:keywords]}
+      else
+          books_show = books_temp.select {|value| value.send(params[:selectbox]).to_s.include? params[:keywords]}
+      end
+      if params[:page_no].nil?
+          page_to_show = 1
+      else
+          page_to_show = params[:page_no].to_i
+      end
+      books_show_last = books_show[(page_to_show-1)*OrbitHelper.page_data_count...page_to_show*OrbitHelper.page_data_count]
+      books = books_show_last
+      books_total_pages = (books_show.length/OrbitHelper.page_data_count.to_f).ceil
+    else
+      books_total_pages = books.total_pages
+    end
     book_list = []
     books.each do |book|
       t = []
@@ -49,7 +79,7 @@ class PersonalBooksController < ApplicationController
       end
       book_list << {"books" => t}
     end
-
+    choice_show = []
     headers = []
     fields_to_show.each do |fs|
       col = 2
@@ -58,12 +88,30 @@ class PersonalBooksController < ApplicationController
         "head-title" => t("personal_book.#{fs}"),
         "col" => col
       }
+      choice_show << t("personal_book.#{fs}")
     end
+    choice_value = fields_to_show
+    choice_value.unshift("default")
+    choice_select=choice_value.map{|iter| iter==params[:selectbox] ? "selected" : ""}
+    choice_select=choice_select.map{|value| {"choice_select" => value}}
+    choice_value=choice_value.map{|value| {"choice_value" => value}}
+    choice_default = params[:locale]!='en' ? "——選取分類——" : "——select class——"
+    choice_show.unshift(choice_default)
+    choice_show=choice_show.map{|value| {"choice_show" => value}}
+    choice=choice_value.zip(choice_show,choice_select)
+    choice=choice.map{|value| value.inject:merge}
+    select_text = params[:locale]!='en' ? "搜尋類別:" : "search class:"
+    search_text = params[:locale]!='en' ? "關鍵字搜尋:" : "word to search:"
     {
       "book_list" => book_list,
-      "extras" => {"widget-title" => t("module_name.book")},
+      "extras" => {"widget-title" => t("module_name.book"), 
+                    "url" => "/"+params[:locale]+params[:url], 
+                    "select_text" => select_text, 
+                    "search_text" => search_text,
+                    "search_value" => params[:keywords]},
       "headers" => headers,
-      "total_pages" => books.total_pages
+      "total_pages" => books_total_pages,
+      "choice" => choice
     }
   end