diff --git a/src/main/java/nlib/sch/web/NlibSearchController.java b/src/main/java/nlib/sch/web/NlibSearchController.java index 02d3ddfe..1c064d1e 100644 --- a/src/main/java/nlib/sch/web/NlibSearchController.java +++ b/src/main/java/nlib/sch/web/NlibSearchController.java @@ -90,7 +90,7 @@ public class NlibSearchController extends NlibCommonController { * @param req * @return */ - @RequestMapping(value = {"/search/searchList.do", "/search/searchListCondition.do"} ) + @RequestMapping(value = {"/search/searchList.do"} ) public String searchList( HttpServletRequest req , Authentication authentication @@ -102,25 +102,6 @@ public class NlibSearchController extends NlibCommonController { HttpSession session = request.getSession(); String councilCd = (String)session.getAttribute("councilCd"); - boolean fromMenu = request.getServletPath().contains("/search/searchList.do"); - - if(fromMenu) { - String sfield = searchVO.getSfield(); - String query = searchVO.getQuery(); - String collection = searchVO.getCollection(); - searchVO = new NlibSearchVO(); - searchVO.setSfield(sfield); - searchVO.setQuery(query); - searchVO.setCollection(collection); - } - - if(!fromMenu && !isValidCsrfToken(request, csrfToken)) - { - model.addAttribute("msg", "잘못된 접근입니다."); - model.addAttribute("url","/"); - return "nlib/cmm/alert"; - } - //검색엔진파라미터로 문화원코드 searchVO.setMngOrgCd(councilCd); diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp index 19d18776..f2f9fabb 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp @@ -353,7 +353,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp index 65b5d4b0..94c20fae 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp @@ -189,7 +189,7 @@ function fnTabMoveSch(collection){ fnFilterSch(); } function fnFilterSch(){ - document.referencelistForm.action="/search/searchListCondition.do"; + document.referencelistForm.action="/search/searchList.do"; document.referencelistForm.submit(); } @@ -209,7 +209,7 @@ function fn_search_article(pageIndex) { -