From c6a2a6418cba76a2101e68966e03c17636af0410 Mon Sep 17 00:00:00 2001 From: chiu Date: Thu, 15 Aug 2019 09:40:33 +0800 Subject: [PATCH] Update personal_journals_controller.rb --- app/controllers/personal_journals_controller.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/controllers/personal_journals_controller.rb b/app/controllers/personal_journals_controller.rb index 65e4a42..2158c7f 100644 --- a/app/controllers/personal_journals_controller.rb +++ b/app/controllers/personal_journals_controller.rb @@ -1,6 +1,7 @@ class PersonalJournalsController < ApplicationController def search_all_words(target,word) - words=word.split(' ') + target=target.upcase + words=word.upcase.split(' ') return words.select{|value| target.include? value}==words end def index @@ -29,20 +30,20 @@ class PersonalJournalsController < ApplicationController case params[:selectbox] when "paper_title","default" if page.custom_string_field == "table" - journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.paper_title.upcase,params[:keywords].upcase)} + journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.paper_title,params[:keywords])} else - journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.create_link.upcase,params[:keywords].upcase)} + journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.create_link,params[:keywords])} end when "level_type" - journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_levels.collect{|x| x.title}.join(', ').to_s.upcase,params[:keywords].upcase)} + journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_levels.collect{|x| x.title}.join(', ').to_s,params[:keywords])} when "publication_date" - journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', ').upcase,params[:keywords].upcase)} + journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.send("publication_date").strftime("%Y/%m").collect{|x| x.title}.join(', '),params[:keywords])} when "author_type" - journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", ").upcase,params[:keywords].upcase)} + journal_papers_show = journal_papers_temp.select {|value| search_all_words(value.journal_paper_author_types.collect{|jat| jat.title}.join(", "),params[:keywords])} when "language" - journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : "").upcase,params[:keywords].upcase)} + journal_papers_show = journal_papers_temp.select {|value| search_all_words((!value.language.nil? ? t("#{value.language}") : ""),params[:keywords])} else - journal_papers_show = jjournal_papers_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s.upcase,params[:keywords].upcase)} + journal_papers_show = jjournal_papers_temp.select {|value| search_all_words(value.send(params[:selectbox]).to_s,params[:keywords])} end if params[:page_no].nil? page_to_show = 1